Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1665.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1665
Author: eem
Time: 25 January 2016, 4:59:23.956016 pm
UUID: fcc356bf-0c12-4902-8cac-f0b6a96194d9
Ancestors: VMMaker.oscog-eem.1664
Spur:
Add a free space mode to the leak checked to help track down the Newspeak image startup crashes we've seen recently at Cadence. So checkFreeSpace is refactored to checkFreeSpace: gcMode.
Insist on inlining objectAfter:limit:. Never inline prepareForSnapshot or writeImageFileIO (for C-level debugging).
Spur Cogit: Support CompiledMethod indexing in genPrimitiveAt[Put]. Refactor to pull-out the num-literals access from genPrimitiveObjectAt.
CoInterpreter: Remove the atCache from the CoInterpreter. It's of little benefit in the Cogit.
StackInterpreter: Don't eneter an object into the atCache if it is 16-bit indexable (this is easier, or rather likely more efficient for non-16-bit access, than implementing 16-bit indexability in the atCache).
Slang: Support allMask: for the Spur free space leak check. Put log time stamps in more informative places. Don't plant comments for elided inlined methods.
=============== Diff against VMMaker.oscog-eem.1664 ===============
Item was added:
+ ----- Method: CCodeGenerator>>generateAllMask:on:indent: (in category 'C translation') -----
+ generateAllMask: msgNode on: aStream indent: level
+ "Generate the C code for this message onto the given stream."
+
+ aStream nextPutAll: '(('.
+ self generateBitAnd: msgNode on: aStream indent: level.
+ aStream nextPutAll: ') == '.
+ self emitCExpression: msgNode args first on: aStream indent: level.
+ aStream nextPut: $)!
Item was changed:
----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation support') -----
initializeCTranslationDictionary
"Initialize the dictionary mapping message names to actions for C code generation."
| pairs |
translationDict := Dictionary new: 200.
pairs := #(
#& #generateAnd:on:indent:
#| #generateOr:on:indent:
#and: #generateSequentialAnd:on:indent:
#or: #generateSequentialOr:on:indent:
#not #generateNot:on:indent:
#+ #generatePlus:on:indent:
#- #generateMinus:on:indent:
#negated #generateNegated:on:indent:
#* #generateTimes:on:indent:
#/ #generateDivide:on:indent:
#// #generateDivide:on:indent:
#\\ #generateModulo:on:indent:
#<< #generateShiftLeft:on:indent:
#>> #generateShiftRight:on:indent:
#>>> #generateSignedShiftRight:on:indent:
#min: #generateMin:on:indent:
#max: #generateMax:on:indent:
#between:and: #generateBetweenAnd:on:indent:
#bitAnd: #generateBitAnd:on:indent:
#bitOr: #generateBitOr:on:indent:
#bitXor: #generateBitXor:on:indent:
#bitShift: #generateBitShift:on:indent:
#signedBitShift: #generateSignedBitShift:on:indent:
#bitInvert32 #generateBitInvert:on:indent:
#bitInvert64 #generateBitInvert:on:indent:
#bitClear: #generateBitClear:on:indent:
#truncateTo: #generateTruncateTo:on:indent:
#rounded #generateRounded:on:indent:
#< #generateLessThan:on:indent:
#<= #generateLessThanOrEqual:on:indent:
#= #generateEqual:on:indent:
#> #generateGreaterThan:on:indent:
#>= #generateGreaterThanOrEqual:on:indent:
#~= #generateNotEqual:on:indent:
#== #generateEqual:on:indent:
#~~ #generateNotEqual:on:indent:
#isNil #generateIsNil:on:indent:
#notNil #generateNotNil:on:indent:
#whileTrue: #generateWhileTrue:on:indent:
#whileFalse: #generateWhileFalse:on:indent:
#whileTrue #generateDoWhileTrue:on:indent:
#whileFalse #generateDoWhileFalse:on:indent:
#to:do: #generateToDo:on:indent:
#to:by:do: #generateToByDo:on:indent:
#repeat #generateRepeat:on:indent:
#timesRepeat: #generateTimesRepeat:on:indent:
#ifTrue: #generateIfTrue:on:indent:
#ifFalse: #generateIfFalse:on:indent:
#ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent:
#ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent:
#ifNotNil: #generateIfNotNil:on:indent:
#ifNil: #generateIfNil:on:indent:
#ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent:
#ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent:
#at: #generateAt:on:indent:
#at:put: #generateAtPut:on:indent:
#basicAt: #generateAt:on:indent:
#basicAt:put: #generateAtPut:on:indent:
#integerValueOf: #generateIntegerValueOf:on:indent:
#integerObjectOf: #generateIntegerObjectOf:on:indent:
#isIntegerObject: #generateIsIntegerObject:on:indent:
#cCode: #generateInlineCCode:on:indent:
#cCode:inSmalltalk: #generateInlineCCode:on:indent:
#cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent:
#cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent:
#cppIf:ifTrue: #generateInlineCppIfElse:on:indent:
#cCoerce:to: #generateCCoercion:on:indent:
#cCoerceSimple:to: #generateCCoercion:on:indent:
#addressOf: #generateAddressOf:on:indent:
#addressOf:put: #generateAddressOf:on:indent:
#asAddress:put: #generateAsAddress:on:indent:
#signedIntFromLong64 #generateSignedIntFromLong64:on:indent:
#signedIntFromLong #generateSignedIntFromLong:on:indent:
#signedIntFromShort #generateSignedIntFromShort:on:indent:
#signedIntToLong64 #generateSignedIntToLong64:on:indent:
#signedIntToLong #generateSignedIntToLong:on:indent:
#signedIntToShort #generateSignedIntToShort:on:indent:
#preIncrement #generatePreIncrement:on:indent:
#preDecrement #generatePreDecrement:on:indent:
#inline: #generateInlineDirective:on:indent:
#asFloat #generateAsFloat:on:indent:
#asInteger #generateAsInteger:on:indent:
#asUnsignedInteger #generateAsUnsignedInteger:on:indent:
#asLong #generateAsLong:on:indent:
#asUnsignedLong #generateAsUnsignedLong:on:indent:
#asVoidPointer #generateAsVoidPointer:on:indent:
#asSymbol #generateAsSymbol:on:indent:
#flag: #generateFlag:on:indent:
#anyMask: #generateBitAnd:on:indent:
+ #allMask: #generateAllMask:on:indent:
#noMask: #generateNoMask:on:indent:
#raisedTo: #generateRaisedTo:on:indent:
#touch: #generateTouch:on:indent:
#bytesPerOop #generateBytesPerOop:on:indent:
#bytesPerWord #generateBytesPerWord:on:indent:
#wordSize #generateBytesPerWord:on:indent:
#baseHeaderSize #generateBaseHeaderSize:on:indent:
#minSmallInteger #generateSmallIntegerConstant:on:indent:
#maxSmallInteger #generateSmallIntegerConstant:on:indent:
#sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent:
#perform: #generatePerform:on:indent:
#perform:with: #generatePerform:on:indent:
#perform:with:with: #generatePerform:on:indent:
#perform:with:with:with: #generatePerform:on:indent:
#perform:with:with:with:with: #generatePerform:on:indent:
#perform:with:with:with:with:with: #generatePerform:on:indent:
#value #generateValue:on:indent:
#value: #generateValue:on:indent:
#value:value: #generateValue:on:indent:
#value:value:value: #generateValue:on:indent:
#value:value:value:value: #generateValue:on:indent:
#deny: #generateDeny:on:indent:
#shouldNotImplement #generateSmalltalkMetaError:on:indent:
#shouldBeImplemented #generateSmalltalkMetaError:on:indent:
#subclassResponsibility #generateSmalltalkMetaError:on:indent:
).
1 to: pairs size by: 2 do: [:i |
translationDict at: (pairs at: i) put: (pairs at: i + 1)].
pairs := #(
#ifTrue: #generateIfTrueAsArgument:on:indent:
#ifFalse: #generateIfFalseAsArgument:on:indent:
#ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent:
#ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent:
#ifNotNil: #generateIfNotNilAsArgument:on:indent:
#ifNil: #generateIfNilAsArgument:on:indent:
#ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent:
#ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent:
#cCode: #generateInlineCCodeAsArgument:on:indent:
#cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent:
#cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent:
#cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent:
#value #generateValueAsArgument:on:indent:
#value: #generateValueAsArgument:on:indent:
#value:value: #generateValueAsArgument:on:indent:
).
asArgumentTranslationDict := Dictionary new: 8.
1 to: pairs size by: 2 do: [:i |
asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)].
!
Item was changed:
----- Method: CoInterpreter class>>declareCVarsIn: (in category 'translation') -----
declareCVarsIn: aCCodeGenerator
"Override to avoid repeating StackInterpreter's declarations and add our own extensions"
self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses"
aCCodeGenerator
addHeaderFile:'"sqCogStackAlignment.h"';
addHeaderFile:'"cogmethod.h"'.
NewspeakVM ifTrue:
[aCCodeGenerator addHeaderFile:'"nssendcache.h"'].
aCCodeGenerator
addHeaderFile: (aCCodeGenerator vmClass isThreadedVM
ifTrue: ['"cointerpmt.h"']
ifFalse: ['"cointerp.h"']);
addHeaderFile:'"cogit.h"'.
aCCodeGenerator vmClass
declareInterpreterVersionIn: aCCodeGenerator
defaultName: aCCodeGenerator interpreterVersion.
aCCodeGenerator
var: #heapBase type: #usqInt;
var: #statCodeCompactionUsecs type: #usqLong;
var: #maxLiteralCountForCompile
declareC: 'sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* ', MaxLiteralCountForCompile printString, ' */';
var: #minBackwardJumpCountForCompile
declareC: 'sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* ', MinBackwardJumpCountForCompile printString, ' */'.
+ aCCodeGenerator removeVariable: 'atCache'.
aCCodeGenerator
var: #reenterInterpreter
declareC: 'jmp_buf reenterInterpreter; /* private export */'.
aCCodeGenerator
var: #primTraceLogIndex type: #'unsigned char';
var: #primTraceLog declareC: 'sqInt primTraceLog[256]';
var: #traceLog
declareC: 'sqInt traceLog[TraceBufferSize /* ', TraceBufferSize printString, ' */]';
var: #traceSources type: #'char *' array: TraceSources!
Item was added:
+ ----- Method: CoInterpreter class>>initializeCaches (in category 'initialization') -----
+ initializeCaches
+ "Eliminate the AtCache"
+ AtCacheTotalSize := AtCacheSize := AtCacheMask := AtCacheFixedFields := AtCacheFmt := AtCacheOop := #undefined!
Item was changed:
----- Method: CoInterpreter class>>initializeFrameIndices (in category 'initialization') -----
initializeFrameIndices
"Format of a stack frame. Word-sized indices relative to the frame pointer.
Terminology
Frames are either single (have no context) or married (have a context).
Contexts are either single (exist on the heap), married (have a context) or widowed (had a frame that has exited).
Stacks grow down:
receiver for method activations/closure for block activations
arg0
...
argN
caller's saved ip/this stackPage (for a base frame)
fp-> saved fp
method
context (initialized to nil)
frame flags (interpreter only)
saved method ip (initialized to 0; interpreter only)
receiver
first temp
...
sp-> Nth temp
In an interpreter frame
frame flags holds
the backward jump count (see ifBackwardsCheckForEvents)
the number of arguments (since argument temporaries are above the frame)
the flag for a block activation
and the flag indicating if the context field is valid (whether the frame is married).
saved method ip holds the saved method ip when the callee frame is a machine code frame.
This is because the saved method ip is actually the ceReturnToInterpreterTrampoline address.
In a machine code frame
the flag indicating if the context is valid is the least significant bit of the method pointer
the flag for a block activation is the next most significant bit of the method pointer
Interpreter frames are distinguished from method frames by the method field which will
be a pointer into the heap for an interpreter frame and a pointer into the method zone for
a machine code frame.
The first frame in a stack page is the baseFrame and is marked as such by a saved fp being its stackPage,
in which case the first word on the stack is the caller context (possibly hybrid) beneath the base frame."
| fxCallerSavedIP fxSavedFP fxMethod fxIFrameFlags fxThisContext fxIFReceiver fxMFReceiver fxIFSavedIP |
fxCallerSavedIP := 1.
fxSavedFP := 0.
fxMethod := -1.
fxThisContext := -2.
fxIFrameFlags := -3. "Can find numArgs, needed for fast temp access. args are above fxCallerSavedIP.
Can find ``is block'' bit
Can find ``has context'' bit"
fxIFSavedIP := -4.
fxIFReceiver := -5.
fxMFReceiver := -3.
+ "For debugging undefine values that differ in the StackInterpreter."
+ FrameSlots := #undefined.
- "For debugging nil out values that differ in the StackInterpreter."
- FrameSlots := #undeclared.
IFrameSlots := fxCallerSavedIP - fxIFReceiver + 1.
MFrameSlots := fxCallerSavedIP - fxMFReceiver + 1.
FoxCallerSavedIP := fxCallerSavedIP * BytesPerWord.
"In Cog a base frame's caller context is stored on the first word of the stack page."
+ FoxCallerContext := #undefined.
- FoxCallerContext := #undeclared.
FoxSavedFP := fxSavedFP * BytesPerWord.
FoxMethod := fxMethod * BytesPerWord.
FoxThisContext := fxThisContext * BytesPerWord.
+ FoxFrameFlags := #undefined.
- FoxFrameFlags := #undeclared.
FoxIFrameFlags := fxIFrameFlags * BytesPerWord.
FoxIFSavedIP := fxIFSavedIP * BytesPerWord.
+ FoxReceiver := #undefined.
- FoxReceiver := #undeclared.
FoxIFReceiver := fxIFReceiver * BytesPerWord.
FoxMFReceiver := fxMFReceiver * BytesPerWord.
"N.B. There is room for one more flag given the current 8 byte alignment of methods (which
is at least needed to distinguish the checked and uncecked entry points by their alignment."
MFMethodFlagHasContextFlag := 1.
MFMethodFlagIsBlockFlag := 2.
MFMethodFlagFrameIsMarkedFlag := 4. "for pathTo:using:followWeak:"
MFMethodFlagsMask := MFMethodFlagHasContextFlag + MFMethodFlagIsBlockFlag + MFMethodFlagFrameIsMarkedFlag.
MFMethodMask := (MFMethodFlagsMask + 1) negated!
Item was added:
+ ----- Method: CoInterpreter>>bytecodePrimAt (in category 'common selector sends') -----
+ bytecodePrimAt
+ "Override to eliminate the atCache, something of little benefit to the JIT."
+ messageSelector := self specialSelector: 16.
+ argumentCount := 1.
+ self normalSend!
Item was added:
+ ----- Method: CoInterpreter>>bytecodePrimAtPut (in category 'common selector sends') -----
+ bytecodePrimAtPut
+ "Override to eliminate the atCache, something of little benefit to the JIT."
+ messageSelector := self specialSelector: 17.
+ argumentCount := 2.
+ self normalSend!
Item was added:
+ ----- Method: CoInterpreter>>commonVariable:at:cacheIndex: (in category 'indexing primitive support') -----
+ commonVariable: rcvr at: index cacheIndex: atIx
+ "There is no atCache in the CoInterpreter."
+ self shouldNotImplement!
Item was added:
+ ----- Method: CoInterpreter>>commonVariable:at:put:cacheIndex: (in category 'indexing primitive support') -----
+ commonVariable: rcvr at: index put: value cacheIndex: atIx
+ "There is no atCache in the CoInterpreter."
+ self shouldNotImplement!
Item was added:
+ ----- Method: CoInterpreter>>flushAtCache (in category 'method lookup cache') -----
+ flushAtCache
+ "There is no atCache in the CoInterpreter."
+ <inline: true>!
Item was added:
+ ----- Method: CogObjectRepresentation>>genGetMethodHeaderOf:into:scratch: (in category 'compile abstract instructions') -----
+ genGetMethodHeaderOf: methodReg into: headerReg scratch: scratchReg
+ "Get the method header (first word) of a CompiledMethod into headerReg.
+ Deal with the method possibly being cogged."
+ | jumpNotCogged |
+ <var: #jumpNotCogged type: #'AbstractInstruction *'>
+ cogit MoveMw: objectMemory baseHeaderSize r: methodReg R: headerReg.
+ jumpNotCogged := self genJumpSmallInteger: headerReg scratchReg: scratchReg.
+ cogit MoveMw: (cogit offset: CogMethod of: #methodHeader) r: headerReg R: headerReg.
+ jumpNotCogged jmpTarget: cogit Label.
+ ^0!
Item was changed:
----- Method: CogObjectRepresentationFor32BitSpur>>genPrimitiveAt (in category 'primitive generators') -----
genPrimitiveAt
+ | formatReg convertToIntAndReturn methodInBounds
- | formatReg convertToIntAndReturn
jumpNotIndexable jumpImmediate jumpBadIndex
+ jumpIsBytes jumpIsShorts jumpIsWords jumpIsMethod
+ jumpWordTooBig jumpIsArray jumpHasFixedFields jumpIsContext
+ jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds
+ jumpMethodOutOfBounds jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds |
- jumpIsBytes jumpIsShorts jumpIsWords jumpWordTooBig jumpIsArray jumpHasFixedFields jumpIsContext
- jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds |
"c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:"
<var: #jumpIsBytes type: #'AbstractInstruction *'>
<var: #jumpIsShorts type: #'AbstractInstruction *'>
+ <var: #jumpIsMethod type: #'AbstractInstruction *'>
<var: #jumpBadIndex type: #'AbstractInstruction *'>
<var: #jumpIsContext type: #'AbstractInstruction *'>
<var: #jumpImmediate type: #'AbstractInstruction *'>
+ <var: #methodInBounds type: #'AbstractInstruction *'>
<var: #jumpWordTooBig type: #'AbstractInstruction *'>
<var: #jumpNotIndexable type: #'AbstractInstruction *'>
<var: #jumpHasFixedFields type: #'AbstractInstruction *'>
<var: #convertToIntAndReturn type: #'AbstractInstruction *'>
<var: #jumpArrayOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'>
+ <var: #jumpMethodOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpFixedFieldsOutOfBounds type: #'AbstractInstruction *'>
cogit genLoadArgAtDepth: 0 into: Arg0Reg.
jumpImmediate := self genJumpImmediate: ReceiverResultReg.
cogit MoveR: Arg0Reg R: Arg1Reg.
jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
self genConvertSmallIntegerToIntegerInReg: Arg1Reg.
cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel"
"formatReg := self formatOf: ReceiverResultReg"
self genGetFormatOf: ReceiverResultReg
into: (formatReg := SendNumArgsReg)
leastSignificantHalfOfBaseHeaderIntoScratch: TempReg.
self genGetNumSlotsOf: ReceiverResultReg into: ClassReg.
"dispatch on format in a combination of highest dynamic frequency order first and convenience.
0 = 0 sized objects (UndefinedObject True False et al)
1 = non-indexable objects with inst vars (Point et al)
2 = indexable objects with no inst vars (Array et al)
3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al)
4 = weak indexable objects with inst vars (WeakArray et al)
5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron)
6 unused, reserved for exotic pointer objects?
7 Forwarded Object, 1st field is pointer, rest of fields are ignored
8 unused, reserved for exotic non-pointer objects?
9 (?) 64-bit indexable
10 - 11 32-bit indexable
12 - 15 16-bit indexable
16 - 23 byte indexable
24 - 31 compiled method"
cogit CmpCq: objectMemory firstByteFormat R: formatReg.
jumpIsBytes := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory arrayFormat R: formatReg.
jumpIsArray := cogit JumpZero: 0.
jumpNotIndexable := cogit JumpBelow: 0.
cogit CmpCq: objectMemory weakArrayFormat R: formatReg.
jumpHasFixedFields := cogit JumpBelowOrEqual: 0.
cogit CmpCq: objectMemory firstShortFormat R: formatReg.
jumpIsShorts := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory firstLongFormat R: formatReg.
jumpIsWords := cogit JumpAboveOrEqual: 0.
"For now ignore 64-bit indexability."
jumpNotIndexable jmpTarget: cogit Label.
jumpNotIndexable := cogit Jump: 0.
+ jumpIsArray jmpTarget:
+ (cogit CmpR: Arg1Reg R: ClassReg).
+ jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0.
+ cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg.
+ cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg.
+ cogit genPrimReturn.
+
jumpIsBytes jmpTarget:
(cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg).
+ cogit AndCq: objectMemory wordSize - 1 R: formatReg R: TempReg.
+ cogit SubR: TempReg R: ClassReg;
- cogit AndCq: objectMemory wordSize - 1 R: formatReg.
- cogit SubR: formatReg R: ClassReg;
CmpR: Arg1Reg R: ClassReg.
jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0.
+ cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg.
+ jumpIsMethod := cogit JumpAboveOrEqual: 0.
+ methodInBounds :=
+ (cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg).
- cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg.
cogit backEnd byteReadsZeroExtend
ifTrue:
[cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg]
ifFalse:
[cogit "formatReg already contains a value <= 16r1f, so no need to zero it"
MoveXbr: Arg1Reg R: ReceiverResultReg R: formatReg;
MoveR: formatReg R: ReceiverResultReg].
convertToIntAndReturn := cogit Label.
self genConvertIntegerToSmallIntegerInReg: ReceiverResultReg.
cogit genPrimReturn.
jumpIsShorts jmpTarget:
(cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg).
cogit AndCq: 1 R: formatReg.
cogit SubR: formatReg R: ClassReg;
CmpR: Arg1Reg R: ClassReg.
jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddR: Arg1Reg R: ReceiverResultReg.
cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: ReceiverResultReg.
cogit Jump: convertToIntAndReturn.
jumpIsWords jmpTarget:
(cogit CmpR: Arg1Reg R: ClassReg).
jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg.
cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: TempReg.
jumpWordTooBig := self jumpNotSmallIntegerUnsignedValueInRegister: TempReg.
cogit MoveR: TempReg R: ReceiverResultReg.
cogit Jump: convertToIntAndReturn.
jumpHasFixedFields jmpTarget:
(cogit AndCq: objectMemory classIndexMask R: TempReg).
cogit MoveR: TempReg R: formatReg.
cogit CmpCq: ClassMethodContextCompactIndex R: TempReg.
jumpIsContext := cogit JumpZero: 0.
cogit PushR: ClassReg.
self genGetClassObjectOfClassIndex: formatReg into: ClassReg scratchReg: TempReg.
self genLoadSlot: InstanceSpecificationIndex sourceReg: ClassReg destReg: formatReg.
cogit PopR: ClassReg.
self genConvertSmallIntegerToIntegerInReg: formatReg.
cogit
AndCq: objectMemory fixedFieldsOfClassFormatMask R: formatReg;
SubR: formatReg R: ClassReg;
CmpR: Arg1Reg R: ClassReg.
jumpFixedFieldsOutOfBounds := cogit JumpBelowOrEqual: 0.
"index is (formatReg (fixed fields) + Arg1Reg (0-rel index)) * wordSize + baseHeaderSize"
cogit AddR: formatReg R: Arg1Reg.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg.
cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg.
cogit genPrimReturn.
+ jumpIsMethod jmpTarget: cogit Label.
+ "Now check that the index is beyond the method's literals..."
+ self getLiteralCountOf: ReceiverResultReg plusOne: true inBytes: true into: ClassReg scratch: TempReg.
+ cogit CmpR: Arg1Reg R: ClassReg.
+ cogit JumpBelow: methodInBounds.
+ jumpMethodOutOfBounds := cogit Jump: 0.
- jumpIsArray jmpTarget:
- (cogit CmpR: Arg1Reg R: ClassReg).
- jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0.
- cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg.
- cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg.
- cogit genPrimReturn.
jumpWordTooBig jmpTarget:
+ (jumpFixedFieldsOutOfBounds jmpTarget:
- (cogit SubCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg).
-
- jumpFixedFieldsOutOfBounds jmpTarget:
(jumpArrayOutOfBounds jmpTarget:
(jumpBytesOutOfBounds jmpTarget:
+ (jumpMethodOutOfBounds jmpTarget:
(jumpShortsOutOfBounds jmpTarget:
(jumpWordsOutOfBounds jmpTarget:
(jumpNotIndexable jmpTarget:
(jumpIsContext jmpTarget:
(jumpBadIndex jmpTarget:
+ (jumpImmediate jmpTarget: cogit Label)))))))))).
- (jumpImmediate jmpTarget: cogit Label)))))))).
+ ^0 "Can't be complete because of contexts."!
- ^0!
Item was changed:
----- Method: CogObjectRepresentationFor32BitSpur>>genPrimitiveAtPut (in category 'primitive generators') -----
genPrimitiveAtPut
+ | formatReg methodInBounds
+ jumpImmediate jumpBadIndex jumpImmutable jumpNotIndexablePointers jumpNotIndexableBits
- | formatReg jumpImmediate jumpBadIndex jumpImmutable
- jumpNotIndexablePointers jumpNotIndexableBits
jumpIsContext jumpIsCompiledMethod jumpIsBytes jumpIsShorts jumpHasFixedFields
jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds
jumpWordsOutOfBounds jumpShortsOutOfBounds jumpBytesOutOfBounds
jumpShortsOutOfRange jumpWordsOutOfRange jumpBytesOutOfRange
jumpNonSmallIntegerValue jumpNotPointers
|
"c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:"
<var: #jumpIsBytes type: #'AbstractInstruction *'>
<var: #jumpIsShorts type: #'AbstractInstruction *'>
<var: #jumpBadIndex type: #'AbstractInstruction *'>
<var: #jumpIsContext type: #'AbstractInstruction *'>
<var: #jumpImmediate type: #'AbstractInstruction *'>
+ <var: #methodInBounds type: #'AbstractInstruction *'>
<var: #jumpHasFixedFields type: #'AbstractInstruction *'>
<var: #jumpNotIndexableBits type: #'AbstractInstruction *'>
<var: #jumpBytesOutOfRange type: #'AbstractInstruction *'>
<var: #jumpWordsOutOfRange type: #'AbstractInstruction *'>
<var: #jumpShortsOutOfRange type: #'AbstractInstruction *'>
<var: #jumpArrayOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpNotIndexablePointers type: #'AbstractInstruction *'>
cogit genLoadArgAtDepth: 1 into: Arg0Reg.
cogit genLoadArgAtDepth: 0 into: Arg1Reg.
jumpImmediate := self genJumpImmediate: ReceiverResultReg.
jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
self genConvertSmallIntegerToIntegerInReg: Arg0Reg.
cogit SubCq: 1 R: Arg0Reg. "1-rel => 0-rel"
"formatReg := self formatOf: ReceiverResultReg"
self cppIf: IMMUTABILITY
ifTrue:
[ self genGetFormatOf: ReceiverResultReg
into: (formatReg := SendNumArgsReg)
leastSignificantHalfOfBaseHeaderIntoScratch: TempReg.
jumpImmutable := self genJumpBaseHeaderImmutable: TempReg ]
ifFalse:
[ self genGetFormatOf: ReceiverResultReg
into: (formatReg := SendNumArgsReg)
leastSignificantHalfOfBaseHeaderIntoScratch: NoReg ].
self genGetNumSlotsOf: ReceiverResultReg into: ClassReg.
"dispatch on format in a combination of highest dynamic frequency order first and convenience.
0 = 0 sized objects (UndefinedObject True False et al)
1 = non-indexable objects with inst vars (Point et al)
2 = indexable objects with no inst vars (Array et al)
3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al)
4 = weak indexable objects with inst vars (WeakArray et al)
5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron)
6 unused, reserved for exotic pointer objects?
7 Forwarded Object, 1st field is pointer, rest of fields are ignored
8 unused, reserved for exotic non-pointer objects?
9 (?) 64-bit indexable
10 - 11 32-bit indexable
12 - 15 16-bit indexable
16 - 23 byte indexable
24 - 31 compiled method"
cogit CmpCq: objectMemory weakArrayFormat R: formatReg.
jumpNotPointers := cogit JumpAbove: 0.
"optimistic store check; assume index in range (almost always is)."
self genStoreCheckReceiverReg: ReceiverResultReg
valueReg: Arg1Reg
scratchReg: TempReg
inFrame: false.
cogit CmpCq: objectMemory arrayFormat R: formatReg.
jumpNotIndexablePointers := cogit JumpBelow: 0.
jumpHasFixedFields := cogit JumpNonZero: 0.
cogit CmpR: Arg0Reg R: ClassReg.
jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg0Reg.
cogit MoveR: Arg1Reg Xwr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
jumpHasFixedFields jmpTarget: cogit Label.
self genGetClassIndexOfNonImm: ReceiverResultReg into: formatReg.
cogit CmpCq: ClassMethodContextCompactIndex R: formatReg.
jumpIsContext := cogit JumpZero: 0.
"get # fixed fields in formatReg"
cogit PushR: ClassReg.
self genGetClassObjectOfClassIndex: formatReg into: ClassReg scratchReg: TempReg.
self genLoadSlot: InstanceSpecificationIndex sourceReg: ClassReg destReg: formatReg.
cogit PopR: ClassReg.
self genConvertSmallIntegerToIntegerInReg: formatReg.
cogit AndCq: objectMemory fixedFieldsOfClassFormatMask R: formatReg.
cogit SubR: formatReg R: ClassReg.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: formatReg.
cogit CmpR: Arg0Reg R: ClassReg.
jumpFixedFieldsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddR: formatReg R: Arg0Reg.
cogit MoveR: Arg1Reg Xwr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
+ jumpNotPointers jmpTarget: cogit Label.
- jumpNotPointers jmpTarget:
- (cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg).
- jumpIsCompiledMethod := cogit JumpAboveOrEqual: 0.
jumpNonSmallIntegerValue := self genJumpNotSmallInteger: Arg1Reg scratchReg: TempReg.
cogit CmpCq: objectMemory firstByteFormat R: formatReg.
jumpIsBytes := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory firstShortFormat R: formatReg.
jumpIsShorts := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory firstLongFormat R: formatReg.
"For now ignore 64-bit indexability."
jumpNotIndexableBits := cogit JumpBelow: 0.
"fall through to double words"
cogit CmpR: Arg0Reg R: ClassReg.
jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit MoveR: Arg1Reg R: TempReg.
self genConvertSmallIntegerToIntegerInReg: TempReg.
(cogit lastOpcode setsConditionCodesFor: JumpLess) ifFalse:
[cogit CmpCq: 0 R: TempReg]. "N.B. FLAGS := TempReg - 0"
jumpWordsOutOfRange := cogit JumpLess: 0.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg0Reg.
cogit MoveR: TempReg Xwr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
jumpIsBytes jmpTarget:
(cogit CmpCq: (objectMemory integerObjectOf: 255) R: Arg1Reg).
jumpBytesOutOfRange := cogit JumpAbove: 0.
cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg.
+ cogit AndCq: objectMemory wordSize - 1 R: formatReg R: TempReg.
+ cogit SubR: TempReg R: ClassReg.
- cogit AndCq: objectMemory wordSize - 1 R: formatReg.
- cogit SubR: formatReg R: ClassReg.
cogit CmpR: Arg0Reg R: ClassReg.
jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0.
+ cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg.
+ jumpIsCompiledMethod := cogit JumpAboveOrEqual: 0.
+ methodInBounds :=
cogit MoveR: Arg1Reg R: TempReg.
self genConvertSmallIntegerToIntegerInReg: TempReg.
cogit AddCq: objectMemory baseHeaderSize R: Arg0Reg.
cogit MoveR: TempReg Xbr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
jumpIsShorts jmpTarget:
(cogit CmpCq: (objectMemory integerObjectOf: 65535) R: Arg1Reg).
jumpShortsOutOfRange := cogit JumpAbove: 0.
cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg.
cogit AndCq: objectMemory wordSize / 2 - 1 R: formatReg.
cogit SubR: formatReg R: ClassReg.
cogit CmpR: Arg0Reg R: ClassReg.
jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit MoveR: Arg1Reg R: TempReg.
self genConvertSmallIntegerToIntegerInReg: TempReg.
cogit AddR: Arg0Reg R: ReceiverResultReg.
cogit MoveR: TempReg M16: objectMemory baseHeaderSize r: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
+ "Now check that the index is beyond the method's literals..."
+ jumpIsCompiledMethod jmpTarget: cogit Label.
+ self getLiteralCountOf: ReceiverResultReg plusOne: true inBytes: true into: ClassReg scratch: TempReg.
+ cogit CmpR: Arg0Reg R: ClassReg.
+ cogit JumpBelow: methodInBounds.
+
jumpIsContext jmpTarget:
(jumpNotIndexableBits jmpTarget:
(jumpBytesOutOfRange jmpTarget:
(jumpWordsOutOfRange jmpTarget:
(jumpShortsOutOfRange jmpTarget:
(jumpIsCompiledMethod jmpTarget:
(jumpArrayOutOfBounds jmpTarget:
(jumpBytesOutOfBounds jmpTarget:
(jumpShortsOutOfBounds jmpTarget:
(jumpWordsOutOfBounds jmpTarget:
(jumpNotIndexablePointers jmpTarget:
(jumpNonSmallIntegerValue jmpTarget:
(jumpFixedFieldsOutOfBounds jmpTarget: cogit Label)))))))))))).
self cppIf: IMMUTABILITY
ifTrue: [jumpImmutable jmpTarget: jumpIsContext getJmpTarget].
cogit AddCq: 1 R: Arg0Reg. "0-rel => 1-rel"
self genConvertIntegerToSmallIntegerInReg: Arg0Reg.
jumpBadIndex jmpTarget: (jumpImmediate jmpTarget: cogit Label).
+ ^0 "Can't be complete because of contexts."!
- ^0!
Item was added:
+ ----- Method: CogObjectRepresentationFor32BitSpur>>getLiteralCountOf:plusOne:inBytes:into:scratch: (in category 'compile abstract instructions') -----
+ getLiteralCountOf: methodReg plusOne: plusOne inBytes: inBytes into: litCountReg scratch: scratchReg
+ "Get the literal count of a CompiledMethod into headerReg, plus one if requested.
+ If inBytes is true, scale the count by the word size. Deal with the possibility of
+ the method being cogged."
+ self genGetMethodHeaderOf: methodReg into: litCountReg scratch: scratchReg.
+ inBytes
+ ifTrue:
+ [cogit
+ AndCq: coInterpreter alternateHeaderNumLiteralsMask << 1 R: litCountReg;
+ LogicalShiftLeftCq: 1 R: litCountReg]
+ ifFalse:
+ [cogit
+ LogicalShiftRightCq: 1 R: litCountReg;
+ AndCq: coInterpreter alternateHeaderNumLiteralsMask R: litCountReg].
+ plusOne ifTrue:
+ [cogit AddCq: (inBytes ifTrue: [objectMemory wordSize] ifFalse: [1]) R: litCountReg].
+ ^0!
Item was changed:
----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveAt (in category 'primitive generators') -----
genPrimitiveAt
+ | formatReg convertToIntAndReturn methodInBounds
- | formatReg convertToIntAndReturn
jumpNotIndexable jumpImmediate jumpBadIndex
+ jumpIsBytes jumpIsShorts jumpIsWords jumpIsMethod jumpIsArray jumpIsContext
+ jumpHasFixedFields jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds
+ jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds |
- jumpIsBytes jumpIsShorts jumpIsWords jumpIsArray jumpHasFixedFields jumpIsContext
- jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds |
"c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:"
<var: #jumpIsBytes type: #'AbstractInstruction *'>
<var: #jumpIsShorts type: #'AbstractInstruction *'>
<var: #jumpBadIndex type: #'AbstractInstruction *'>
+ <var: #jumpIsMethod type: #'AbstractInstruction *'>
<var: #jumpIsContext type: #'AbstractInstruction *'>
<var: #jumpImmediate type: #'AbstractInstruction *'>
+ <var: #methodInBounds type: #'AbstractInstruction *'>
<var: #jumpNotIndexable type: #'AbstractInstruction *'>
<var: #jumpHasFixedFields type: #'AbstractInstruction *'>
<var: #convertToIntAndReturn type: #'AbstractInstruction *'>
<var: #jumpArrayOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpFixedFieldsOutOfBounds type: #'AbstractInstruction *'>
cogit genLoadArgAtDepth: 0 into: Arg0Reg.
jumpImmediate := self genJumpImmediate: ReceiverResultReg.
cogit MoveR: Arg0Reg R: Arg1Reg.
jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
self genConvertSmallIntegerToIntegerInReg: Arg1Reg.
cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel"
"formatReg := self formatOf: ReceiverResultReg"
self genGetFormatOf: ReceiverResultReg
into: (formatReg := SendNumArgsReg)
leastSignificantHalfOfBaseHeaderIntoScratch: TempReg.
self genGetNumSlotsOf: ReceiverResultReg into: ClassReg.
"dispatch on format in a combination of highest dynamic frequency order first and convenience.
0 = 0 sized objects (UndefinedObject True False et al)
1 = non-indexable objects with inst vars (Point et al)
2 = indexable objects with no inst vars (Array et al)
3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al)
4 = weak indexable objects with inst vars (WeakArray et al)
5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron)
6 unused, reserved for exotic pointer objects?
7 Forwarded Object, 1st field is pointer, rest of fields are ignored
8 unused, reserved for exotic non-pointer objects?
9 (?) 64-bit indexable
10 - 11 32-bit indexable
12 - 15 16-bit indexable
16 - 23 byte indexable
24 - 31 compiled method"
cogit CmpCq: objectMemory firstByteFormat R: formatReg.
jumpIsBytes := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory arrayFormat R: formatReg.
jumpIsArray := cogit JumpZero: 0.
jumpNotIndexable := cogit JumpBelow: 0.
cogit CmpCq: objectMemory weakArrayFormat R: formatReg.
jumpHasFixedFields := cogit JumpBelowOrEqual: 0.
cogit CmpCq: objectMemory firstShortFormat R: formatReg.
jumpIsShorts := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory firstLongFormat R: formatReg.
jumpIsWords := cogit JumpAboveOrEqual: 0.
"For now ignore 64-bit indexability."
jumpNotIndexable jmpTarget: cogit Label.
jumpNotIndexable := cogit Jump: 0.
+ jumpIsArray jmpTarget:
+ (cogit CmpR: Arg1Reg R: ClassReg).
+ jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0.
+ cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg.
+ cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg.
+ cogit genPrimReturn.
+
jumpIsBytes jmpTarget:
(cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg).
+ cogit AndCq: objectMemory wordSize - 1 R: formatReg R: TempReg.
+ cogit SubR: TempReg R: ClassReg;
- cogit AndCq: objectMemory wordSize - 1 R: formatReg.
- cogit SubR: formatReg R: ClassReg;
CmpR: Arg1Reg R: ClassReg.
jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0.
+ cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg.
+ jumpIsMethod := cogit JumpAboveOrEqual: 0.
+ methodInBounds :=
+ (cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg).
- cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg.
cogit backEnd byteReadsZeroExtend
ifTrue:
[cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg]
ifFalse:
[cogit "formatReg already contains a value <= 16r1f, so no need to zero it"
MoveXbr: Arg1Reg R: ReceiverResultReg R: formatReg;
MoveR: formatReg R: ReceiverResultReg].
convertToIntAndReturn := cogit Label.
self genConvertIntegerToSmallIntegerInReg: ReceiverResultReg.
cogit genPrimReturn.
jumpIsShorts jmpTarget:
(cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg).
cogit AndCq: 1 R: formatReg.
cogit SubR: formatReg R: ClassReg;
CmpR: Arg1Reg R: ClassReg.
jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddR: Arg1Reg R: ReceiverResultReg.
cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: ReceiverResultReg.
cogit Jump: convertToIntAndReturn.
jumpIsWords jmpTarget:
(cogit CmpR: Arg1Reg R: ClassReg).
jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddCq: objectMemory baseHeaderSize >> (objectMemory shiftForWord - 1) R: Arg1Reg.
cogit MoveX32r: Arg1Reg R: ReceiverResultReg R: TempReg.
cogit MoveR: TempReg R: ReceiverResultReg.
cogit Jump: convertToIntAndReturn.
jumpHasFixedFields jmpTarget:
(cogit AndCq: objectMemory classIndexMask R: TempReg).
cogit MoveR: TempReg R: formatReg.
cogit CmpCq: ClassMethodContextCompactIndex R: TempReg.
jumpIsContext := cogit JumpZero: 0.
self genGetClassObjectOfClassIndex: formatReg into: Scratch0Reg scratchReg: TempReg.
self genLoadSlot: InstanceSpecificationIndex sourceReg: Scratch0Reg destReg: formatReg.
self genConvertSmallIntegerToIntegerInReg: formatReg.
cogit
AndCq: objectMemory fixedFieldsOfClassFormatMask R: formatReg;
SubR: formatReg R: ClassReg;
CmpR: Arg1Reg R: ClassReg.
jumpFixedFieldsOutOfBounds := cogit JumpBelowOrEqual: 0.
"index is (formatReg (fixed fields) + Arg1Reg (0-rel index)) * wordSize + baseHeaderSize"
cogit AddR: formatReg R: Arg1Reg.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg.
cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg.
cogit genPrimReturn.
+ jumpIsMethod jmpTarget: cogit Label.
+ "Now check that the index is beyond the method's literals..."
+ self getLiteralCountOf: ReceiverResultReg plusOne: true inBytes: true into: ClassReg scratch: TempReg.
+ cogit CmpR: Arg1Reg R: ClassReg.
+ cogit JumpBelow: methodInBounds.
- jumpIsArray jmpTarget:
- (cogit CmpR: Arg1Reg R: ClassReg).
- jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0.
- cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg.
- cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg.
- cogit genPrimReturn.
jumpFixedFieldsOutOfBounds jmpTarget:
(jumpArrayOutOfBounds jmpTarget:
(jumpBytesOutOfBounds jmpTarget:
(jumpShortsOutOfBounds jmpTarget:
(jumpWordsOutOfBounds jmpTarget:
(jumpNotIndexable jmpTarget:
(jumpIsContext jmpTarget:
(jumpBadIndex jmpTarget:
(jumpImmediate jmpTarget: cogit Label)))))))).
^0!
Item was changed:
----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveAtPut (in category 'primitive generators') -----
genPrimitiveAtPut
+ | formatReg methodInBounds
+ jumpImmediate jumpBadIndex jumpImmutable jumpNotIndexablePointers jumpNotIndexableBits
- | formatReg jumpImmediate jumpBadIndex jumpImmutable
- jumpNotIndexablePointers jumpNotIndexableBits
jumpIsContext jumpIsCompiledMethod jumpIsBytes jumpIsShorts jumpHasFixedFields
jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds
jumpWordsOutOfBounds jumpShortsOutOfBounds jumpBytesOutOfBounds
jumpShortsOutOfRange jumpWordsOutOfRange jumpBytesOutOfRange
jumpNonSmallIntegerValue jumpNotPointers
|
"c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:"
<var: #jumpIsBytes type: #'AbstractInstruction *'>
<var: #jumpIsShorts type: #'AbstractInstruction *'>
<var: #jumpBadIndex type: #'AbstractInstruction *'>
<var: #jumpIsContext type: #'AbstractInstruction *'>
<var: #jumpImmediate type: #'AbstractInstruction *'>
+ <var: #methodInBounds type: #'AbstractInstruction *'>
<var: #jumpHasFixedFields type: #'AbstractInstruction *'>
<var: #jumpNotIndexableBits type: #'AbstractInstruction *'>
<var: #jumpBytesOutOfRange type: #'AbstractInstruction *'>
<var: #jumpWordsOutOfRange type: #'AbstractInstruction *'>
<var: #jumpShortsOutOfRange type: #'AbstractInstruction *'>
<var: #jumpArrayOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'>
<var: #jumpNotIndexablePointers type: #'AbstractInstruction *'>
cogit genLoadArgAtDepth: 1 into: Arg0Reg.
cogit genLoadArgAtDepth: 0 into: Arg1Reg.
jumpImmediate := self genJumpImmediate: ReceiverResultReg.
jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
self genConvertSmallIntegerToIntegerInReg: Arg0Reg.
cogit SubCq: 1 R: Arg0Reg. "1-rel => 0-rel"
"formatReg := self formatOf: ReceiverResultReg"
self cppIf: IMMUTABILITY
ifTrue:
[ self genGetFormatOf: ReceiverResultReg
into: (formatReg := SendNumArgsReg)
leastSignificantHalfOfBaseHeaderIntoScratch: TempReg.
jumpImmutable := self genJumpBaseHeaderImmutable: TempReg ]
ifFalse:
[ self genGetFormatOf: ReceiverResultReg
into: (formatReg := SendNumArgsReg)
leastSignificantHalfOfBaseHeaderIntoScratch: NoReg ].
self genGetNumSlotsOf: ReceiverResultReg into: ClassReg.
"dispatch on format in a combination of highest dynamic frequency order first and convenience.
0 = 0 sized objects (UndefinedObject True False et al)
1 = non-indexable objects with inst vars (Point et al)
2 = indexable objects with no inst vars (Array et al)
3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al)
4 = weak indexable objects with inst vars (WeakArray et al)
5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron)
6 unused, reserved for exotic pointer objects?
7 Forwarded Object, 1st field is pointer, rest of fields are ignored
8 unused, reserved for exotic non-pointer objects?
9 (?) 64-bit indexable
10 - 11 32-bit indexable
12 - 15 16-bit indexable
16 - 23 byte indexable
24 - 31 compiled method"
cogit CmpCq: objectMemory weakArrayFormat R: formatReg.
jumpNotPointers := cogit JumpAbove: 0.
"optimistic store check; assume index in range (almost always is)."
self genStoreCheckReceiverReg: ReceiverResultReg
valueReg: Arg1Reg
scratchReg: TempReg
inFrame: false.
cogit CmpCq: objectMemory arrayFormat R: formatReg.
jumpNotIndexablePointers := cogit JumpBelow: 0.
jumpHasFixedFields := cogit JumpNonZero: 0.
cogit CmpR: Arg0Reg R: ClassReg.
jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg0Reg.
cogit MoveR: Arg1Reg Xwr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
jumpHasFixedFields jmpTarget: cogit Label.
self genGetClassIndexOfNonImm: ReceiverResultReg into: formatReg.
cogit CmpCq: ClassMethodContextCompactIndex R: formatReg.
jumpIsContext := cogit JumpZero: 0.
"get # fixed fields in formatReg"
self genGetClassObjectOfClassIndex: formatReg into: Scratch0Reg scratchReg: TempReg.
self genLoadSlot: InstanceSpecificationIndex sourceReg: Scratch0Reg destReg: formatReg.
self genConvertSmallIntegerToIntegerInReg: formatReg.
cogit AndCq: objectMemory fixedFieldsOfClassFormatMask R: formatReg.
cogit SubR: formatReg R: ClassReg.
cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: formatReg.
cogit CmpR: Arg0Reg R: ClassReg.
jumpFixedFieldsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit AddR: formatReg R: Arg0Reg.
cogit MoveR: Arg1Reg Xwr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
+ jumpNotPointers jmpTarget: cogit Label.
- jumpNotPointers jmpTarget:
- (cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg).
- jumpIsCompiledMethod := cogit JumpAboveOrEqual: 0.
jumpNonSmallIntegerValue := self genJumpNotSmallInteger: Arg1Reg scratchReg: TempReg.
cogit CmpCq: objectMemory firstByteFormat R: formatReg.
jumpIsBytes := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory firstShortFormat R: formatReg.
jumpIsShorts := cogit JumpAboveOrEqual: 0.
cogit CmpCq: objectMemory firstLongFormat R: formatReg.
"For now ignore 64-bit indexability."
jumpNotIndexableBits := cogit JumpBelow: 0.
"fall through to words"
cogit CmpCq: (objectMemory integerObjectOf: 16rFFFFFFFF) R: Arg1Reg.
jumpWordsOutOfRange := cogit JumpAbove: 0.
cogit LogicalShiftLeftCq: objectMemory shiftForWord - 2 R: ClassReg.
cogit AndCq: objectMemory wordSize / 4 - 1 R: formatReg.
cogit SubR: formatReg R: ClassReg.
cogit CmpR: Arg0Reg R: ClassReg.
jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit MoveR: Arg1Reg R: TempReg.
self genConvertSmallIntegerToIntegerInReg: TempReg.
cogit AddCq: objectMemory baseHeaderSize >> (objectMemory shiftForWord - 1) R: Arg0Reg.
cogit MoveR: TempReg X32r: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
jumpIsBytes jmpTarget:
(cogit CmpCq: (objectMemory integerObjectOf: 255) R: Arg1Reg).
jumpBytesOutOfRange := cogit JumpAbove: 0.
cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg.
+ cogit AndCq: objectMemory wordSize - 1 R: formatReg R: TempReg.
+ cogit SubR: TempReg R: ClassReg.
- cogit AndCq: objectMemory wordSize - 1 R: formatReg.
- cogit SubR: formatReg R: ClassReg.
cogit CmpR: Arg0Reg R: ClassReg.
jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0.
+ cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg.
+ jumpIsCompiledMethod := cogit JumpAboveOrEqual: 0.
+ methodInBounds :=
cogit MoveR: Arg1Reg R: TempReg.
self genConvertSmallIntegerToIntegerInReg: TempReg.
cogit AddCq: objectMemory baseHeaderSize R: Arg0Reg.
cogit MoveR: TempReg Xbr: Arg0Reg R: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
jumpIsShorts jmpTarget:
(cogit CmpCq: (objectMemory integerObjectOf: 65535) R: Arg1Reg).
jumpShortsOutOfRange := cogit JumpAbove: 0.
cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg.
cogit AndCq: objectMemory wordSize / 2 - 1 R: formatReg.
cogit SubR: formatReg R: ClassReg.
cogit CmpR: Arg0Reg R: ClassReg.
jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0.
cogit MoveR: Arg1Reg R: TempReg.
self genConvertSmallIntegerToIntegerInReg: TempReg.
cogit AddR: Arg0Reg R: ReceiverResultReg.
cogit MoveR: TempReg M16: objectMemory baseHeaderSize r: ReceiverResultReg.
cogit MoveR: Arg1Reg R: ReceiverResultReg.
cogit genPrimReturn.
+ "Now check that the index is beyond the method's literals..."
+ jumpIsCompiledMethod jmpTarget: cogit Label.
+ self getLiteralCountOf: ReceiverResultReg plusOne: true inBytes: true into: ClassReg scratch: TempReg.
+ cogit CmpR: Arg0Reg R: ClassReg.
+ cogit JumpBelow: methodInBounds.
+
jumpIsContext jmpTarget:
(jumpNotIndexableBits jmpTarget:
(jumpBytesOutOfRange jmpTarget:
(jumpShortsOutOfRange jmpTarget:
(jumpWordsOutOfRange jmpTarget:
(jumpIsCompiledMethod jmpTarget:
(jumpArrayOutOfBounds jmpTarget:
(jumpBytesOutOfBounds jmpTarget:
(jumpShortsOutOfBounds jmpTarget:
(jumpWordsOutOfBounds jmpTarget:
(jumpNotIndexablePointers jmpTarget:
(jumpNonSmallIntegerValue jmpTarget:
(jumpFixedFieldsOutOfBounds jmpTarget: cogit Label)))))))))))).
self cppIf: IMMUTABILITY
ifTrue: [jumpImmutable jmpTarget: jumpIsContext getJmpTarget].
cogit AddCq: 1 R: Arg0Reg. "0-rel => 1-rel"
self genConvertIntegerToSmallIntegerInReg: Arg0Reg.
jumpBadIndex jmpTarget: (jumpImmediate jmpTarget: cogit Label).
+ ^0 "Can't be complete because of contexts."!
- ^0!
Item was added:
+ ----- Method: CogObjectRepresentationFor64BitSpur>>getLiteralCountOf:plusOne:inBytes:into:scratch: (in category 'compile abstract instructions') -----
+ getLiteralCountOf: methodReg plusOne: plusOne inBytes: inBytes into: litCountReg scratch: scratchReg
+ "Get the literal count of a CompiledMethod into headerReg, plus one if requested.
+ If inBytes is true, scale the count by the word size. Deal with the possibility of
+ the method being cogged."
+ self genGetMethodHeaderOf: methodReg into: litCountReg scratch: scratchReg.
+ self assert: 1 << objectMemory numTagBits = objectMemory wordSize.
+ inBytes
+ ifTrue:
+ [cogit
+ AndCq: coInterpreter alternateHeaderNumLiteralsMask << objectMemory numTagBits
+ R: litCountReg]
+ ifFalse:
+ [cogit
+ LogicalShiftRightCq: objectMemory numTagBits R: litCountReg;
+ AndCq: coInterpreter alternateHeaderNumLiteralsMask R: litCountReg].
+ plusOne ifTrue:
+ [cogit
+ AddCq: (inBytes
+ ifTrue: [LiteralStart * objectMemory wordSize]
+ ifFalse: [LiteralStart])
+ R: litCountReg].
+ ^0!
Item was changed:
----- Method: CogObjectRepresentationForSpur>>genPrimitiveObjectAt (in category 'primitive generators') -----
genPrimitiveObjectAt
+ | headerReg jumpBadIndex jumpBounds jumpNotHeaderIndex |
- | headerReg
- jumpBadIndex jumpNotCogMethod jumpBounds jumpNotHeaderIndex |
<var: #jumpBounds type: #'AbstractInstruction *'>
<var: #jumpBadIndex type: #'AbstractInstruction *'>
- <var: #jumpNotCogMethod type: #'AbstractInstruction *'>
<var: #jumpNotHeaderIndex type: #'AbstractInstruction *'>
cogit genLoadArgAtDepth: 0 into: Arg0Reg.
jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg.
+ self genGetMethodHeaderOf: ReceiverResultReg into: (headerReg := Arg1Reg) scratch: TempReg.
+ cogit CmpCq: (objectMemory integerObjectOf: 1) R: Arg0Reg.
- "get header into Arg1Reg..."
- cogit MoveMw: objectMemory baseHeaderSize r: ReceiverResultReg R: (headerReg := Arg1Reg).
- jumpNotCogMethod := self genJumpSmallInteger: headerReg scratchReg: TempReg.
- cogit MoveMw: (cogit offset: CogMethod of: #methodHeader) r: headerReg R: headerReg.
- jumpNotCogMethod jmpTarget: (cogit
- CmpCq: (objectMemory integerObjectOf: 1) R: Arg0Reg).
jumpNotHeaderIndex := cogit JumpNonZero: 0.
cogit
MoveR: headerReg R: ReceiverResultReg;
genPrimReturn.
jumpNotHeaderIndex jmpTarget: (cogit
AndCq: (objectMemory integerObjectOf: coInterpreter alternateHeaderNumLiteralsMask) R: headerReg).
cogit
SubCq: (objectMemory integerObjectOf: 1) - objectMemory smallIntegerTag R: Arg0Reg;
CmpR: headerReg R: Arg0Reg.
jumpBounds := cogit JumpAbove: 0.
self genConvertSmallIntegerToIntegerInReg: Arg0Reg.
cogit
AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg0Reg;
MoveXwr: Arg0Reg R: ReceiverResultReg R: ReceiverResultReg;
genPrimReturn.
jumpBounds jmpTarget: (cogit
AddCq: (objectMemory integerObjectOf: 1) - objectMemory smallIntegerTag R: Arg0Reg).
jumpBadIndex jmpTarget: cogit Label.
^CompletePrimitive!
Item was added:
+ ----- Method: CogObjectRepresentationForSpur>>getLiteralCountOf:plusOne:inBytes:into:scratch: (in category 'compile abstract instructions') -----
+ getLiteralCountOf: methodReg plusOne: plusOne inBytes: inBytes into: litCountReg scratch: scratchReg
+ "Get the literal count of a CompiledMethod into headerReg, plus one if requested.
+ If inBytes is true, scale the count by the word size. Deal with the possibility of
+ the method being cogged."
+ self subclassResponsibility!
Item was changed:
----- Method: CogVMSimulator>>initialize (in category 'initialization') -----
initialize
"Initialize the CogVMSimulator when running the interpreter inside Smalltalk. The
primary responsibility of this method is to allocate Smalltalk Arrays for variables
that will be declared as statically-allocated global arrays in the translated code."
super initialize.
transcript := Transcript.
objectMemory ifNil:
[objectMemory := self class objectMemoryClass simulatorClass new].
cogit ifNil:
[cogit := self class cogitClass new setInterpreter: self].
objectMemory coInterpreter: self cogit: cogit.
cogit numRegArgs > 0 ifTrue:
[debugStackDepthDictionary := Dictionary new].
cogThreadManager ifNotNil:
[super initialize].
self assert: ConstMinusOne = (objectMemory integerObjectOf: -1).
cogMethodZone := cogit methodZone. "Because Slang can't remove intermediate implicit receivers (cogit methodZone foo doesn't reduce to foo())"
enableCog := true.
methodCache := Array new: MethodCacheSize.
nsMethodCache := Array new: NSMethodCacheSize.
+ atCache := nil.
- atCache := Array new: AtCacheTotalSize.
self flushMethodCache.
cogCompiledCodeCompactionCalledFor := false.
gcSemaphoreIndex := 0.
externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #().
externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize).
externalPrimitiveTableFirstFreeIndex := 0.
primitiveTable := self class primitiveTable copy.
mappedPluginEntries := OrderedCollection new.
objectMemory hasSpurMemoryManagerAPI
ifTrue:
[primitiveAccessorDepthTable := Array new: primitiveTable size.
pluginList := {}.
self loadNewPlugin: '']
ifFalse:
[pluginList := {'' -> self }].
desiredNumStackPages := desiredEdenBytes := desiredCogCodeSize := 0.
"This is initialized on loading the image, but convenient for testing stack page values..."
numStackPages := self defaultNumStackPages.
startMicroseconds := Time totalSeconds * 1000000.
maxLiteralCountForCompile := MaxLiteralCountForCompile.
minBackwardJumpCountForCompile := MinBackwardJumpCountForCompile.
flagInterpretedMethods := false.
"initialize InterpreterSimulator variables used for debugging"
byteCount := lastPollCount := sendCount := lookupCount := 0.
quitBlock := [^ self].
traceOn := true.
printSends := printFrameAtEachStep := printBytecodeAtEachStep := false.
myBitBlt := BitBltSimulator new setInterpreter: self.
displayForm := fakeForm := 'Display has not yet been installed' asDisplayText form.
eventQueue := SharedQueue new.
suppressHeartbeatFlag := deferSmash := deferredSmash := false.
systemAttributes := Dictionary new.
primTraceLog := CArrayAccessor on: (Array new: 256 withAll: 0).
primTraceLogIndex := 0.
traceLog := CArrayAccessor on: (Array new: TraceBufferSize withAll: 0).
traceLogIndex := 0.
traceSources := TraceSources.
statCodeCompactionCount := 0.
statCodeCompactionUsecs := 0.
extSemTabSize := 256!
Item was changed:
----- Method: Spur32BitMemoryManager>>allocateSlotsForPinningInOldSpace:bytes:format:classIndex: (in category 'allocation') -----
allocateSlotsForPinningInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex
"Answer the oop of a chunk of space in oldSpace with numSlots slots. Try and
allocate in a segment that already includes pinned objects. The header of the
result will have been filled-in but not the contents."
<var: #totalBytes type: #usqInt>
<inline: false>
| chunk |
chunk := self allocateOldSpaceChunkOfBytes: totalBytes
suchThat: [:f| (segmentManager segmentContainingObj: f) containsPinned].
chunk ifNil:
[chunk := self allocateOldSpaceChunkOfBytes: totalBytes.
chunk ifNotNil:
[(segmentManager segmentContainingObj: chunk) containsPinned: true]].
+ self checkFreeSpace: GCModeNewSpace.
- self checkFreeSpace.
chunk ifNil:
[^nil].
numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word"
[self flag: #endianness.
self longAt: chunk put: numSlots.
self longAt: chunk + 4 put: self numSlotsMask << self numSlotsHalfShift.
self long64At: chunk + self baseHeaderSize
put: ((self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex)
bitOr: 1 << self pinnedBitShift).
^chunk + self baseHeaderSize].
self long64At: chunk
put: ((self headerForSlots: numSlots format: formatField classIndex: classIndex)
bitOr: 1 << self pinnedBitShift).
^chunk!
Item was changed:
----- Method: Spur32BitMemoryManager>>allocateSlotsInOldSpace:bytes:format:classIndex: (in category 'allocation') -----
allocateSlotsInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex
"Answer the oop of a chunk of space in oldSpace with numSlots slots. The header
will have been filled-in but not the contents. If no memory is available answer nil."
<var: #totalBytes type: #usqInt>
<inline: false>
| chunk |
chunk := self allocateOldSpaceChunkOfBytes: totalBytes.
+ self checkFreeSpace: GCModeNewSpace.
- self checkFreeSpace.
chunk ifNil:
[^nil].
numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word"
[self flag: #endianness.
self longAt: chunk put: numSlots.
self longAt: chunk + 4 put: self numSlotsMask << self numSlotsHalfShift.
self long64At: chunk + self baseHeaderSize
put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex).
^chunk + self baseHeaderSize].
self long64At: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex).
^chunk!
Item was changed:
----- Method: Spur32BitMemoryManager>>objectAfter:limit: (in category 'object enumeration') -----
objectAfter: objOop limit: limit
"Object parsing.
1. all objects have at least a word following the header, for a forwarding pointer.
2. objects with an overflow size have a preceeing word with a saturated numSlots. If the word
following an object doesn't have a saturated numSlots field it must be a single-header object.
If the word following does have a saturated numSlots it must be the overflow size word."
+ <inline: true>
| followingWordAddress followingWord |
followingWordAddress := self addressAfter: objOop.
(self oop: followingWordAddress isGreaterThanOrEqualTo: limit) ifTrue:
[^limit].
self flag: #endianness.
followingWord := self longAt: followingWordAddress + 4.
^followingWord >> self numSlotsHalfShift = self numSlotsMask
ifTrue: [followingWordAddress + self baseHeaderSize]
ifFalse: [followingWordAddress]!
Item was changed:
----- Method: Spur64BitMemoryManager>>allocateSlotsForPinningInOldSpace:bytes:format:classIndex: (in category 'allocation') -----
allocateSlotsForPinningInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex
"Answer the oop of a chunk of space in oldSpace with numSlots slots. Try and
allocate in a segment that already includes pinned objects. The header of the
result will have been filled-in but not the contents."
<var: #totalBytes type: #usqInt>
<inline: false>
| chunk |
chunk := self allocateOldSpaceChunkOfBytes: totalBytes
suchThat: [:f| (segmentManager segmentContainingObj: f) containsPinned].
chunk ifNil:
[chunk := self allocateOldSpaceChunkOfBytes: totalBytes].
+ self checkFreeSpace: GCModeNewSpace.
- self checkFreeSpace.
chunk ifNil:
[^nil].
numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word"
[self longAt: chunk
put: numSlots + (self numSlotsMask << self numSlotsFullShift).
self longAt: chunk + self baseHeaderSize
put: ((self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex)
bitOr: 1 << self pinnedBitShift).
^chunk + self baseHeaderSize].
self longAt: chunk
put: ((self headerForSlots: numSlots format: formatField classIndex: classIndex)
bitOr: 1 << self pinnedBitShift).
^chunk!
Item was changed:
----- Method: Spur64BitMemoryManager>>allocateSlotsInOldSpace:bytes:format:classIndex: (in category 'allocation') -----
allocateSlotsInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex
"Answer the oop of a chunk of space in oldSpace with numSlots slots. The header
will have been filled-in but not the contents. If no memory is available answer nil."
<var: #totalBytes type: #usqInt>
<inline: false>
| chunk |
chunk := self allocateOldSpaceChunkOfBytes: totalBytes.
+ self checkFreeSpace: GCModeNewSpace.
- self checkFreeSpace.
chunk ifNil:
[^nil].
numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word"
[self longAt: chunk
put: numSlots + (self numSlotsMask << self numSlotsFullShift).
self longAt: chunk + self baseHeaderSize
put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex).
^chunk + self baseHeaderSize].
self longAt: chunk
put: (self headerForSlots: numSlots format: formatField classIndex: classIndex).
^chunk!
Item was changed:
----- Method: Spur64BitMemoryManager>>objectAfter:limit: (in category 'object enumeration') -----
objectAfter: objOop limit: limit
"Object parsing.
1. all objects have at least a word following the header, for a forwarding pointer.
2. objects with an overflow size have a preceeing word with a saturated numSlots. If the word
following an object doesn't have a saturated numSlots field it must be a single-header object.
If the word following does have a saturated numSlots it must be the overflow size word."
+ <inline: true>
| followingWordAddress followingWord |
followingWordAddress := self addressAfter: objOop.
(self oop: followingWordAddress isGreaterThanOrEqualTo: limit) ifTrue:
[^limit].
self flag: #endianness.
followingWord := self longAt: followingWordAddress.
^followingWord >> self numSlotsFullShift = self numSlotsMask
ifTrue: [followingWordAddress + self baseHeaderSize]
ifFalse: [followingWordAddress]!
Item was changed:
----- Method: SpurMemoryManager>>allInstancesOf: (in category 'primitive support') -----
allInstancesOf: aClass
"Attempt to answer an array of all objects, excluding those that may
be garbage collected as a side effect of allocating the result array.
If no memory is available answer the number of instances as a SmallInteger.
Since objects are at least 16 bytes big, and the largest SmallInteger covers
1/4 of the address space, the count can never overflow."
| classIndex freeChunk ptr start limit count bytes |
classIndex := self rawHashBitsOf: aClass.
classIndex = 0 ifTrue:
[freeChunk := self allocateSlots: 0 format: self arrayFormat classIndex: ClassArrayCompactIndex.
^freeChunk].
MarkObjectsForEnumerationPrimitives ifTrue:
[self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow."
freeChunk := self allocateLargestFreeChunk.
start := freeChunk + self baseHeaderSize.
limit := self addressAfter: freeChunk.
(self isClassAtUniqueIndex: aClass)
ifTrue:
[self uniqueIndex: classIndex allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]]
ifFalse:
[self ambiguousClass: aClass allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]].
self assert: (self isEmptyObjStack: markStack).
MarkObjectsForEnumerationPrimitives
ifTrue:
[self assert: self allObjectsUnmarked.
self emptyObjStack: weaklingStack]
ifFalse:
[self assert: (self isEmptyObjStack: weaklingStack)].
(count > (ptr - start / self bytesPerOop) "not enough room"
or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word"
[self freeObject: freeChunk.
^self integerObjectOf: count].
count < self numSlotsMask ifTrue:
[| smallObj |
smallObj := self allocateSlots: count format: self arrayFormat classIndex: ClassArrayCompactIndex.
0 to: count - 1 do:
[:i|
self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofFreeChunk: freeChunk)].
self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk).
self beRootIfOld: smallObj.
+ self checkFreeSpace: GCModeFull.
- self checkFreeSpace.
^smallObj].
bytes := self largeObjectBytesForSlots: count.
start := self startOfObject: freeChunk.
self freeChunkWithBytes: limit - start - bytes at: start + bytes.
totalFreeOldSpace := totalFreeOldSpace - bytes.
self rawOverflowSlotsOf: freeChunk put: count.
self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat.
self possibleRootStoreInto: freeChunk.
+ self checkFreeSpace: GCModeFull.
- self checkFreeSpace.
self runLeakCheckerFor: GCModeFull.
^freeChunk
!
Item was changed:
----- Method: SpurMemoryManager>>allObjects (in category 'primitive support') -----
allObjects
"Attempt to answer an array of all objects, excluding those that may
be garbage collected as a side effect of allocating the result array.
If no memory is available answer the number of objects as a SmallInteger.
Since objects are at least 16 bytes big, and the largest SmallInteger covers
1/4 of the address space, the count can never overflow."
| freeChunk ptr start limit count bytes |
MarkObjectsForEnumerationPrimitives ifTrue:
[self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow."
freeChunk := self allocateLargestFreeChunk.
ptr := start := freeChunk + self baseHeaderSize.
limit := self addressAfter: freeChunk.
count := 0.
self allHeapEntitiesDo:
[:obj| "continue enumerating even if no room so as to unmark all objects."
(MarkObjectsForEnumerationPrimitives
ifTrue: [self isMarked: obj]
ifFalse: [true]) ifTrue:
[(self isNormalObject: obj)
ifTrue:
[MarkObjectsForEnumerationPrimitives ifTrue:
[self setIsMarkedOf: obj to: false].
count := count + 1.
ptr < limit ifTrue:
[self longAt: ptr put: obj.
ptr := ptr + self bytesPerOop]]
ifFalse:
[MarkObjectsForEnumerationPrimitives ifTrue:
[(self isSegmentBridge: obj) ifFalse:
[self setIsMarkedOf: obj to: false]]]]].
self assert: (self isEmptyObjStack: markStack).
MarkObjectsForEnumerationPrimitives
ifTrue:
[self assert: self allObjectsUnmarked.
self emptyObjStack: weaklingStack]
ifFalse:
[self assert: (self isEmptyObjStack: weaklingStack)].
self assert: count >= self numSlotsMask.
(count > (ptr - start / self bytesPerOop) "not enough room"
or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word"
[self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk).
+ self checkFreeSpace: GCModeFull.
- self checkFreeSpace.
^self integerObjectOf: count].
bytes := self largeObjectBytesForSlots: count.
start := self startOfObject: freeChunk.
self freeChunkWithBytes: limit - start - bytes at: start + bytes.
totalFreeOldSpace := totalFreeOldSpace - bytes.
self rawOverflowSlotsOf: freeChunk put: count.
self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat.
self possibleRootStoreInto: freeChunk.
+ self checkFreeSpace: GCModeFull.
- self checkFreeSpace.
self runLeakCheckerFor: GCModeFull.
^freeChunk
!
Item was changed:
----- Method: SpurMemoryManager>>checkFreeSpace (in category 'debug support') -----
checkFreeSpace
+ "Bootstrap only"
+ <doNotGenerate>
+ self checkFreeSpace: GCModeFull!
- self assert: self bitsSetInFreeSpaceMaskForAllFreeLists.
- self assert: totalFreeOldSpace = self totalFreeListBytes!
Item was added:
+ ----- Method: SpurMemoryManager>>checkFreeSpace: (in category 'debug support') -----
+ checkFreeSpace: gcModes
+ self assert: self bitsSetInFreeSpaceMaskForAllFreeLists.
+ self assert: totalFreeOldSpace = self totalFreeListBytes.
+ (gcModes > 0
+ and: [checkForLeaks allMask: (GCModeFreeSpace bitOr: gcModes)]) ifTrue:
+ [self runLeakCheckerForFreeSpace: GCModeFreeSpace]!
Item was added:
+ ----- Method: SpurMemoryManager>>checkHeapFreeSpaceIntegrity (in category 'debug support') -----
+ checkHeapFreeSpaceIntegrity
+ "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleFreeSpace
+ has set a bit at each free chunk's header. Scan all objects in the heap checking that no pointer points
+ to a free chunk and that all free chunks that refer to others refer to marked chunks. Answer if all checks pass."
+ | ok |
+ <inline: false>
+ ok := true.
+
+ 0 to: self numFreeLists - 1 do:
+ [:i|
+ (freeLists at: i) ~= 0 ifTrue:
+ [(heapMap heapMapAtWord: (self pointerForOop: (freeLists at: i))) = 0 ifTrue:
+ [coInterpreter print: 'leak in free list '; printNum: i; print: ' to non-free '; printHex: (freeLists at: i); cr.
+ self eek.
+ ok := false]]].
+
+ "Excuse the duplication but performance is at a premium and we avoid
+ some tests by splitting the newSpace and oldSpace enumerations."
+ self allNewSpaceEntitiesDo:
+ [:obj| | fieldOop |
+ (self isFreeObject: obj)
+ ifTrue:
+ [coInterpreter print: 'young object '; printHex: obj; print: ' is free'; cr.
+ self eek.
+ ok := false]
+ ifFalse:
+ [0 to: (self numPointerSlotsOf: obj) - 1 do:
+ [:fi|
+ fieldOop := self fetchPointer: fi ofObject: obj.
+ (self isNonImmediate: fieldOop) ifTrue:
+ [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) ~= 0 ifTrue:
+ [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is free'; cr.
+ self eek.
+ ok := false]]]]].
+ self allOldSpaceEntitiesDo:
+ [:obj| | fieldOop |
+ (self isFreeObject: obj)
+ ifTrue:
+ [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue:
+ [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' is unmapped?!! '; cr.
+ self eek.
+ ok := false].
+ fieldOop := self fetchPointer: self freeChunkNextIndex ofFreeChunk: obj.
+ (fieldOop ~= 0
+ and: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0]) ifTrue:
+ [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' @ 0 = '; printHex: fieldOop; print: ' is unmapped'; cr.
+ self eek.
+ ok := false].
+ (self isLargeFreeObject: obj) ifTrue:
+ [self freeChunkParentIndex to: self freeChunkLargerIndex do:
+ [:fi|
+ fieldOop := self fetchPointer: fi ofFreeChunk: obj.
+ (fieldOop ~= 0
+ and: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0]) ifTrue:
+ [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is unmapped'; cr.
+ self eek.
+ ok := false].]]]
+ ifFalse:
+ [0 to: (self numPointerSlotsOf: obj) - 1 do:
+ [:fi|
+ fieldOop := self fetchPointer: fi ofObject: obj.
+ (self isNonImmediate: fieldOop) ifTrue:
+ [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) ~= 0 ifTrue:
+ [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is free'; cr.
+ self eek.
+ ok := false]]]]].
+ ^ok!
Item was changed:
----- Method: SpurMemoryManager>>checkHeapIntegrity:classIndicesShouldBeValid: (in category 'debug support') -----
checkHeapIntegrity: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid
"Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects
+ has set a bit at each (non-free) object's header. Scan all objects in the heap checking that every
+ pointer points to a header. Scan the rememberedSet, remapBuffer and extraRootTable checking
+ that every entry is a pointer to a header. Check that the number of roots is correct and that all
+ rememberedSet entries have their isRemembered: flag set. Answer if all checks pass."
- has set a bit at each object's header. Scan all objects in the heap checking that every pointer points
- to a header. Scan the rememberedSet, remapBuffer and extraRootTable checking that every entry is
- a pointer to a header. Check that the number of roots is correct and that all rememberedSet entries
- have their isRemembered: flag set. Answer if all checks pass."
| ok numRememberedObjectsInHeap |
<inline: false>
ok := true.
numRememberedObjectsInHeap := 0.
+ 0 to: self numFreeLists - 1 do:
+ [:i|
+ (freeLists at: i) ~= 0 ifTrue:
+ [(heapMap heapMapAtWord: (self pointerForOop: (freeLists at: i))) ~= 0 ifTrue:
+ [coInterpreter print: 'leak in free list '; printNum: i; print: ' to non-free '; printHex: (freeLists at: i); cr.
+ self eek.
+ ok := false]]].
+
"Excuse the duplication but performance is at a premium and we avoid
some tests by splitting the newSpace and oldSpace enumerations."
self allNewSpaceEntitiesDo:
[:obj| | fieldOop classIndex classOop |
+ (self isFreeObject: obj)
+ ifTrue:
+ [coInterpreter print: 'young object '; printHex: obj; print: ' is free'; cr.
- ((self isFreeObject: obj)
- or: [(self isMarked: obj) not and: [excludeUnmarkedNewSpaceObjs]]) ifFalse:
- [(self isRemembered: obj) ifTrue:
- [coInterpreter print: 'young object '; printHex: obj; print: ' is remembered'; cr.
self eek.
+ ok := false]
+ ifFalse:
+ [((self isMarked: obj) not and: [excludeUnmarkedNewSpaceObjs]) ifFalse:
+ [(self isRemembered: obj) ifTrue:
+ [coInterpreter print: 'young object '; printHex: obj; print: ' is remembered'; cr.
- ok := false]].
- (self isForwarded: obj)
- ifTrue:
- [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj.
- (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue:
- [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr.
self eek.
+ ok := false]].
+ (self isForwarded: obj)
+ ifTrue:
+ [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj.
+ (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue:
+ [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr.
- ok := false]]
- ifFalse:
- [classOop := self classOrNilAtIndex: (classIndex := self classIndexOf: obj).
- (classIndicesShouldBeValid
- and: [classOop = nilObj
- and: [(self isHiddenObj: obj) not]]) ifTrue:
- [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr.
- self eek.
- ok := false].
- 0 to: (self numPointerSlotsOf: obj) - 1 do:
- [:fi|
- fieldOop := self fetchPointer: fi ofObject: obj.
- (self isNonImmediate: fieldOop) ifTrue:
- [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue:
- [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr.
self eek.
+ ok := false]]
+ ifFalse:
+ [classOop := self classOrNilAtIndex: (classIndex := self classIndexOf: obj).
+ (classIndicesShouldBeValid
+ and: [classOop = nilObj
+ and: [(self isHiddenObj: obj) not]]) ifTrue:
+ [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr.
+ self eek.
+ ok := false].
+ 0 to: (self numPointerSlotsOf: obj) - 1 do:
+ [:fi|
+ fieldOop := self fetchPointer: fi ofObject: obj.
+ (self isNonImmediate: fieldOop) ifTrue:
+ [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue:
+ [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr.
+ self eek.
+ ok := false]]]]]].
- ok := false]]]]].
self allOldSpaceEntitiesDo:
[:obj| | containsYoung fieldOop classIndex classOop |
+ (self isFreeObject: obj)
+ ifTrue:
+ [(heapMap heapMapAtWord: (self pointerForOop: obj)) ~= 0 ifTrue:
+ [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' is mapped?!! '; cr.
- (self isFreeObject: obj) ifFalse:
- [containsYoung := false.
- (self isRemembered: obj) ifTrue:
- [numRememberedObjectsInHeap := numRememberedObjectsInHeap + 1.
- (scavenger isInRememberedSet: obj) ifFalse:
- [coInterpreter print: 'remembered object '; printHex: obj; print: ' is not in remembered table'; cr.
self eek.
+ ok := false].
+ fieldOop := self fetchPointer: self freeChunkNextIndex ofFreeChunk: obj.
+ (fieldOop ~= 0
+ and: [(heapMap heapMapAtWord: (self pointerForOop: obj)) ~= 0]) ifTrue:
+ [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' @ 0 = '; printHex: fieldOop; print: ' is mapped'; cr.
+ self eek.
+ ok := false].
+ (self isLargeFreeObject: obj) ifTrue:
+ [self freeChunkParentIndex to: self freeChunkLargerIndex do:
+ [:fi|
+ fieldOop := self fetchPointer: fi ofFreeChunk: obj.
+ (fieldOop ~= 0
+ and: [(heapMap heapMapAtWord: (self pointerForOop: obj)) ~= 0]) ifTrue:
+ [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is mapped'; cr.
+ self eek.
+ ok := false].]]]
+ ifFalse:
+ [containsYoung := false.
+ (self isRemembered: obj) ifTrue:
+ [numRememberedObjectsInHeap := numRememberedObjectsInHeap + 1.
+ (scavenger isInRememberedSet: obj) ifFalse:
+ [coInterpreter print: 'remembered object '; printHex: obj; print: ' is not in remembered table'; cr.
- ok := false]].
- (self isForwarded: obj)
- ifTrue:
- [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj.
- (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue:
- [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr.
self eek.
+ ok := false]].
+ (self isForwarded: obj)
+ ifTrue:
+ [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj.
+ (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue:
+ [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr.
+ self eek.
+ ok := false].
+ (self isReallyYoung: fieldOop) ifTrue:
+ [containsYoung := true]]
+ ifFalse:
+ [classOop := self classOrNilAtIndex: (classIndex := self classIndexOf: obj).
+ (classIndicesShouldBeValid
+ and: [classOop = nilObj
+ and: [classIndex > self lastClassIndexPun]]) ifTrue:
+ [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr.
+ self eek.
+ ok := false].
+ 0 to: (self numPointerSlotsOf: obj) - 1 do:
+ [:fi|
+ fieldOop := self fetchPointer: fi ofObject: obj.
+ (self isNonImmediate: fieldOop) ifTrue:
+ [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue:
+ [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr.
+ self eek.
+ ok := false].
+ "don't be misled by CogMethods; they appear to be young, but they're not"
+ (self isReallyYoung: fieldOop) ifTrue:
+ [containsYoung := true]]]].
+ containsYoung ifTrue:
+ [(self isRemembered: obj) ifFalse:
+ [coInterpreter print: 'unremembered object '; printHex: obj; print: ' contains young oop(s)'; cr.
- ok := false].
- (self isReallyYoung: fieldOop) ifTrue:
- [containsYoung := true]]
- ifFalse:
- [classOop := self classOrNilAtIndex: (classIndex := self classIndexOf: obj).
- (classIndicesShouldBeValid
- and: [classOop = nilObj
- and: [classIndex > self lastClassIndexPun]]) ifTrue:
- [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr.
self eek.
+ ok := false]]]].
- ok := false].
- 0 to: (self numPointerSlotsOf: obj) - 1 do:
- [:fi|
- fieldOop := self fetchPointer: fi ofObject: obj.
- (self isNonImmediate: fieldOop) ifTrue:
- [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue:
- [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr.
- self eek.
- ok := false].
- "don't be misled by CogMethods; they appear to be young, but they're not"
- (self isReallyYoung: fieldOop) ifTrue:
- [containsYoung := true]]]].
- containsYoung ifTrue:
- [(self isRemembered: obj) ifFalse:
- [coInterpreter print: 'unremembered object '; printHex: obj; print: ' contains young oop(s)'; cr.
- self eek.
- ok := false]]]].
numRememberedObjectsInHeap ~= scavenger rememberedSetSize ifTrue:
[coInterpreter
print: 'root count mismatch. #heap roots ';
printNum: numRememberedObjectsInHeap;
print: '; #roots ';
printNum: scavenger rememberedSetSize;
cr.
self eek.
"But the system copes with overflow..."
self flag: 'no support for remembered set overflow yet'.
"ok := rootTableOverflowed and: [needGCFlag]"].
scavenger rememberedSetWithIndexDo:
[:obj :i|
(obj bitAnd: self wordSize - 1) ~= 0
ifTrue:
[coInterpreter print: 'misaligned oop in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr.
self eek.
ok := false]
ifFalse:
[(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0
ifTrue:
[coInterpreter print: 'object leak in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr.
self eek.
ok := false]
ifFalse:
[(self isYoung: obj) ifTrue:
[coInterpreter print: 'non-root in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr.
self eek.
ok := false]]]].
1 to: remapBufferCount do:
[:ri| | obj |
obj := remapBuffer at: ri.
(obj bitAnd: self wordSize - 1) ~= 0
ifTrue:
[coInterpreter print: 'misaligned remapRoot @ '; printNum: ri; print: ' = '; printHex: obj; cr.
self eek.
ok := false]
ifFalse:
[(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue:
[coInterpreter print: 'object leak in remapRoots @ '; printNum: ri; print: ' = '; printHex: obj; cr.
self eek.
ok := false]]].
1 to: extraRootCount do:
[:ri| | obj |
obj := (extraRoots at: ri) at: 0.
(obj bitAnd: self wordSize - 1) ~= 0
ifTrue:
[coInterpreter print: 'misaligned extraRoot @ '; printNum: ri; print: ' => '; printHex: obj; cr.
self eek.
ok := false]
ifFalse:
[(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue:
[coInterpreter print: 'object leak in extraRoots @ '; printNum: ri; print: ' => '; printHex: obj; cr.
self eek.
ok := false]]].
^ok!
Item was added:
+ ----- Method: SpurMemoryManager>>clearLeakMapAndMapAccessibleFreeSpace (in category 'debug support') -----
+ clearLeakMapAndMapAccessibleFreeSpace
+ "Perform an integrity/leak check using the heapMap. Set a bit at each free chunk's header."
+ <inline: false>
+ heapMap clearHeapMap.
+ self allOldSpaceEntitiesFrom: self firstObject
+ do: [:objOop|
+ (self isFreeObject: objOop) ifTrue:
+ [heapMap heapMapAtWord: (self pointerForOop: objOop) Put: 1]]!
Item was changed:
----- Method: SpurMemoryManager>>computeFreeSpacePostSwizzle (in category 'free space') -----
computeFreeSpacePostSwizzle
totalFreeOldSpace := self totalFreeListBytes.
+ self checkFreeSpace: 0!
- self checkFreeSpace!
Item was changed:
----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact (in category 'gc - global') -----
freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact
"Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space.
Doubly-link the free chunks in address order through the freeChunkNextIndex field using the
xor trick to use only one field, see e.g.
The Art of Computer Programming, Vol 1, D.E. Knuth, 3rd Ed, Sec 2.2.4 `Circular Lists', exercise. 18
http://en.wikipedia.org/wiki/XOR_linked_list.
Record the lowest free object in firstFreeChunk and the highest in lastFreeChunk.
Let the segmentManager mark which segments contain pinned objects via notePinned:."
| prevPrevFree prevFree |
<inline: #never> "for profiling"
+ self checkFreeSpace: GCModeFull.
- self checkFreeSpace.
scavenger forgetUnmarkedRememberedObjects.
self doScavenge: MarkOnTenure.
segmentManager prepareForGlobalSweep."for notePinned:"
"throw away the list heads, including the tree."
self resetFreeListHeads.
firstFreeChunk := prevPrevFree := prevFree := 0.
self allOldSpaceEntitiesForCoalescingFrom: self firstObject do:
[:o|
self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]).
(self isMarked: o)
ifTrue: "forwarders should have been followed in markAndTrace:"
[self assert: (self isForwarded: o) not.
self setIsMarkedOf: o to: false. "this will unmark bridges. undo the damage in notePinned:"
(self isPinned: o) ifTrue:
[segmentManager notePinned: o]]
ifFalse: "unmarked; two cases, an unreachable object or a free chunk."
[| here |
self assert: (self isRemembered: o) not. "scavenger should have cleared this above"
here := self coallesceFreeChunk: o.
self setObjectFree: here.
self inSortedFreeListLink: prevFree to: here given: prevPrevFree.
prevPrevFree := prevFree.
prevFree := here]].
prevFree ~= firstFreeChunk ifTrue:
[self storePointer: self freeChunkNextIndex
ofFreeChunk: prevFree
withValue: prevPrevFree].
lastFreeChunk := prevFree.
self inSortedFreeListLink: lastFreeChunk to: 0 given: prevPrevFree.
self assert: self checkTraversableSortedFreeList!
Item was changed:
----- Method: SpurMemoryManager>>garbageCollectForSnapshot (in category 'snapshot') -----
garbageCollectForSnapshot
self flushNewSpace. "There is no place to put newSpace in the snapshot file."
self flag: 'If we wanted to shrink the rememberedSet prior to snapshot this is the place to do it.'.
numCompactionPasses := CompactionPassesForSnapshot.
self fullGC.
numCompactionPasses := CompactionPassesForGC.
segmentManager prepareForSnapshot.
+ self checkFreeSpace: GCModeFull!
- self checkFreeSpace!
Item was changed:
----- Method: SpurMemoryManager>>growOldSpaceByAtLeast: (in category 'growing/shrinking memory') -----
growOldSpaceByAtLeast: minAmmount
"Attempt to grow memory by at least minAmmount.
Answer the size of the new segment, or nil if the attempt failed."
| ammount headroom total |
<var: #segInfo type: #'SpurSegmentInfo *'>
"statGrowMemory counts attempts, not successes."
statGrowMemory := statGrowMemory + 1."we need to include overhead for a new object header plus the segment bridge."
ammount := minAmmount + (self baseHeaderSize * 2 + self bridgeSize).
"round up to the nearest power of two."
ammount := 1 << (ammount - 1) highBit.
"and grow by at least growHeadroom."
ammount := ammount max: growHeadroom.
"Now apply the maxOldSpaceSize limit, if one is in effect."
maxOldSpaceSize > 0 ifTrue:
[total := segmentManager totalBytesInSegments.
total >= maxOldSpaceSize ifTrue:
[^nil].
headroom := maxOldSpaceSize - total.
headroom < ammount ifTrue:
[headroom < (minAmmount + (self baseHeaderSize * 2 + self bridgeSize)) ifTrue:
[^nil].
ammount := headroom]].
^(segmentManager addSegmentOfSize: ammount) ifNotNil:
[:segInfo|
self assimilateNewSegment: segInfo.
"and add the new free chunk to the free list; done here
instead of in assimilateNewSegment: for the assert"
self addFreeChunkWithBytes: segInfo segSize - self bridgeSize at: segInfo segStart.
self assert: (self addressAfter: (self objectStartingAt: segInfo segStart))
= (segInfo segLimit - self bridgeSize).
+ self checkFreeSpace: GCModeFreeSpace.
- self checkFreeSpace.
segmentManager checkSegments.
segInfo segSize]!
Item was changed:
----- Method: SpurMemoryManager>>initializeOldSpaceFirstFree: (in category 'free space') -----
initializeOldSpaceFirstFree: startOfFreeOldSpace
<var: 'startOfFreeOldSpace' type: #usqInt>
| limit freeOldStart freeChunk |
<var: 'limit' type: #usqInt>
<var: 'freeOldStart' type: #usqInt>
limit := endOfMemory - self bridgeSize.
limit > startOfFreeOldSpace ifTrue:
[totalFreeOldSpace := totalFreeOldSpace + (limit - startOfFreeOldSpace).
freeOldStart := startOfFreeOldSpace.
self wordSize > 4 ifTrue:
[[limit - freeOldStart >= (1 << 32)] whileTrue:
[freeChunk := self freeChunkWithBytes: (1 << 32) at: freeOldStart.
freeOldStart := freeOldStart + (1 << 32).
self assert: freeOldStart = (self addressAfter: freeChunk)]].
freeOldStart < limit ifTrue:
[freeChunk := self freeChunkWithBytes: limit - freeOldStart at: freeOldStart.
self assert: (self addressAfter: freeChunk) = limit]].
endOfMemory := endOfMemory - self bridgeSize.
freeOldSpaceStart := endOfMemory.
+ self checkFreeSpace: GCModeFreeSpace!
- self checkFreeSpace!
Item was changed:
----- Method: SpurMemoryManager>>objectsReachableFromRoots: (in category 'image segment in/out') -----
objectsReachableFromRoots: arrayOfRoots
"This is part of storeImageSegmentInto:outPointers:roots:.
Answer an Array of all the objects only reachable from the argument, an Array of root objects,
starting with arrayOfRoots. If there is no space, answer a SmallInteger whose value is the
number of slots required. This is used to collect the objects to include in an image segment
on Spur, separate from creating the segment, hence simplifying the implementation.
Thanks to Igor Stasenko for this idea."
| freeChunk ptr start limit count oop objOop |
self assert: (self isArray: arrayOfRoots).
"Mark all objects except those only reachable from the arrayOfRoots by marking
each object in arrayOfRoots and then marking all reachable objects (from the
system roots). This leaves unmarked only objects reachable from the arrayOfRoots.
N.B. A side-effect of the marking is that all forwarders in arrayOfRoots will be followed."
self assert: self allObjectsUnmarked.
self markObjectsIn: arrayOfRoots.
self markObjects: false.
"After the mark phase all unreachable weak slots will have been nilled
and all active ephemerons fired."
self assert: (self isEmptyObjStack: markStack).
self assert: (self isEmptyObjStack: weaklingStack).
self assert: self noUnscannedEphemerons.
"Use the largest free chunk to answer the result."
freeChunk := self allocateLargestFreeChunk.
ptr := start := freeChunk + self baseHeaderSize.
limit := self addressAfter: freeChunk.
count := 0.
"First put the arrayOfRoots; order is important."
count := count + 1.
ptr < limit ifTrue:
[self longAt: ptr put: arrayOfRoots.
ptr := ptr + self bytesPerOop].
0 to: (self numSlotsOf: arrayOfRoots) - 1 do:
[:i|
oop := self fetchPointer: i ofObject: arrayOfRoots.
(self isNonImmediate: oop) ifTrue:
[self push: oop onObjStack: markStack]].
"Now collect the unmarked objects reachable from the roots."
[self isEmptyObjStack: markStack] whileFalse:
[objOop := self popObjStack: markStack.
count := count + 1.
ptr < limit ifTrue:
[self longAt: ptr put: objOop.
ptr := ptr + self bytesPerOop].
oop := self fetchClassOfNonImm: objOop.
(self isMarked: oop) ifFalse:
[self setIsMarkedOf: objOop to: true.
self push: oop onObjStack: markStack].
((self isContextNonImm: objOop)
and: [coInterpreter isStillMarriedContext: objOop]) "widow now, before the loop"
ifTrue:
[0 to: (coInterpreter numSlotsOfMarriedContext: objOop) - 1 do:
[:i|
oop := coInterpreter fetchPointer: i ofMarriedContext: objOop.
((self isImmediate: oop)
or: [self isMarked: oop]) ifFalse:
[self setIsMarkedOf: objOop to: true.
self push: oop onObjStack: markStack]]]
ifFalse:
[0 to: (self numPointerSlotsOf: objOop) - 1 do:
[:i|
oop := self fetchPointer: i ofObject: objOop.
((self isImmediate: oop)
or: [self isMarked: oop]) ifFalse:
[self setIsMarkedOf: objOop to: true.
self push: oop onObjStack: markStack]]]].
self unmarkAllObjects.
totalFreeOldSpace := totalFreeOldSpace - (self bytesInObject: freeChunk).
"Now try and allocate the result"
(count > (ptr - start / self bytesPerOop) "not enough room"
or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word"
[self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk).
+ self checkFreeSpace: GCModeImageSegment.
- self checkFreeSpace.
^self integerObjectOf: count].
"There's room; set the format, & classIndex and shorten."
self setFormatOf: freeChunk to: self arrayFormat.
self setClassIndexOf: freeChunk to: ClassArrayCompactIndex.
self shorten: freeChunk toIndexableSize: count.
self possibleRootStoreInto: freeChunk.
+ self checkFreeSpace: GCModeImageSegment.
- self checkFreeSpace.
self runLeakCheckerFor: GCModeImageSegment.
^freeChunk!
Item was changed:
----- Method: SpurMemoryManager>>rebuildFreeListsForPigCompact (in category 'compaction') -----
rebuildFreeListsForPigCompact
"Rebuild the free lists from the doubly-linked free list."
<inline: false>
self assert: self checkTraversableSortedFreeList.
totalFreeOldSpace := 0.
self sortedFreeListDo:
[:freeObj| | start bytes |
bytes := (self bytesInObject: freeObj).
start := self startOfObject: freeObj.
self addFreeChunkWithBytes: bytes at: start].
+ self checkFreeSpace: GCModeFull!
- self checkFreeSpace!
Item was added:
+ ----- Method: SpurMemoryManager>>runLeakCheckerForFreeSpace: (in category 'debug support') -----
+ runLeakCheckerForFreeSpace: gcModes
+ <inline: false>
+ (gcModes anyMask: GCModeFreeSpace) ifTrue:
+ [coInterpreter reverseDisplayFrom: 16 to: 19.
+ self clearLeakMapAndMapAccessibleFreeSpace.
+ self assert: self checkHeapFreeSpaceIntegrity]!
Item was changed:
----- Method: SpurMemoryManager>>scavengingGCTenuringIf: (in category 'gc - scavenging') -----
scavengingGCTenuringIf: tenuringCriterion
"Run the scavenger."
<inline: false>
self assert: remapBufferCount = 0.
(self asserta: scavenger eden limit - freeStart > coInterpreter interpreterAllocationReserveBytes) ifFalse:
[coInterpreter tab;
printNum: scavenger eden limit - freeStart; space;
printNum: coInterpreter interpreterAllocationReserveBytes; space;
printNum: coInterpreter interpreterAllocationReserveBytes - (scavenger eden limit - freeStart); cr].
self checkMemoryMap.
+ self checkFreeSpace: GCModeNewSpace.
- self checkFreeSpace.
self runLeakCheckerFor: GCModeNewSpace.
coInterpreter
preGCAction: GCModeNewSpace;
"would prefer this to be in mapInterpreterOops, but
compatibility with ObjectMemory dictates it goes here."
flushMethodCacheFrom: newSpaceStart to: newSpaceLimit.
needGCFlag := false.
gcStartUsecs := coInterpreter ioUTCMicrosecondsNow.
self doScavenge: tenuringCriterion.
statScavenges := statScavenges + 1.
statGCEndUsecs := coInterpreter ioUTCMicrosecondsNow.
statSGCDeltaUsecs := statGCEndUsecs - gcStartUsecs.
statScavengeGCUsecs := statScavengeGCUsecs + statSGCDeltaUsecs.
statRootTableCount := scavenger rememberedSetSize.
coInterpreter postGCAction: GCModeNewSpace.
self runLeakCheckerFor: GCModeNewSpace.
+ self checkFreeSpace: GCModeNewSpace!
- self checkFreeSpace!
Item was changed:
----- Method: SpurSegmentManager>>postSnapshot (in category 'snapshot') -----
postSnapshot
"Restore all shortened segments to their proper size, re-freeing the trailing space."
<inline: false>
| seg |
<var: #seg type: #'SpurSegmentInfo *'>
"Set endOfMemory first, to avoid assert fails in freeChunkWithBytes:at:."
seg := self addressOf: (segments at: numSegments - 1).
seg lastFreeObject
ifNil: [self assert: manager endOfMemory = (seg segLimit - manager bridgeSize)]
ifNotNil: [manager setEndOfMemory: seg savedSegSize + seg segStart - manager bridgeSize].
numSegments - 1 to: 0 by: -1 do:
[:i|
seg := self addressOf: (segments at: i).
seg lastFreeObject ifNotNil:
[:freeChunk| | address |
address := seg segLimit - manager bridgeSize.
seg segSize: seg savedSegSize.
self bridgeFrom: seg
to: (i < (numSegments - 1) ifTrue: [self addressOf: (segments at: i + 1)]).
manager
addFreeChunkWithBytes: seg segLimit - address - manager bridgeSize
at: address]].
self checkSegments.
+ manager checkFreeSpace: GCModeFull!
- manager checkFreeSpace!
Item was changed:
----- Method: SpurSegmentManager>>prepareForSnapshot (in category 'snapshot') -----
prepareForSnapshot
"shorten all segments by any trailing free space."
+ <inline: #never>
- <inline: false>
<var: #seg type: #'SpurSegmentInfo *'>
self checkSegments.
0 to: numSegments - 1 do:
[:i|
(segments at: i)
savedSegSize: (segments at: i) segSize;
lastFreeObject: nil].
"Ideally finding the lastFreeObject of each segment would be
done in some linear pass through the heap. But for now KISS."
manager freeTreeNodesDo:
[:freeChunk| | node next seg |
node := freeChunk.
[node ~= 0] whileTrue:
[next := manager objectAfter: node limit: manager endOfMemory.
(manager isSegmentBridge: next)
ifTrue:
[seg := self segmentContainingObj: node.
seg lastFreeObject: node.
node := 0]
ifFalse:
[node := manager
fetchPointer: manager freeChunkNextIndex
ofFreeChunk: node]].
freeChunk].
0 to: numSegments - 1 do:
[:i|
(segments at: i) lastFreeObject ifNotNil:
[:freeChunk|
manager detachFreeObject: freeChunk.
(segments at: i)
segSize: (manager startOfObject: freeChunk)
+ manager bridgeSize
- (segments at: i) segStart.
self bridgeFrom: (self addressOf: (segments at: i))
to: (i < (numSegments - 1) ifTrue: [self addressOf: (segments at: i + 1)])]].
"perhaps this should read
manager setEndOfMemory: 0; assimilateNewSegment: (segments at: numSegments - 1)"
manager setEndOfMemory: (segments at: numSegments - 1) segLimit - manager bridgeSize!
Item was changed:
InterpreterPrimitives subclass: #StackInterpreter
instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue localAbsentReceiver localAbsentReceiverOrZero extA extB primitiveFunctionPointer methodCache nsMethodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals'
+ classVariableNames: 'AccessModifierPrivate AccessModifierProtected AccessModifierPublic AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AlternateHeaderIsOptimizedFlag AlternateHeaderNumLiteralsMask AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex EnforceAccessControl FailImbalancedPrimitives LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderFlagBitPosition MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask'
- classVariableNames: 'AccessModifierPrivate AccessModifierProtected AccessModifierPublic AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AlternateHeaderIsOptimizedFlag AlternateHeaderNumLiteralsMask AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex EnforceAccessControl FailImbalancedPrimitives LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderFlagBitPosition MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask'
poolDictionaries: 'VMBasicConstants VMBytecodeConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMStackFrameOffsets'
category: 'VMMaker-Interpreter'!
!StackInterpreter commentStamp: 'eem 12/5/2014 11:32' prior: 0!
This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts.
It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms.
The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context.
In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case.
StackInterpreter and subclasses support multiple memory managers. Currently there are two. NewMemoryManager is a slightly refined version of ObjectMemory, and is the memory manager and garbage collector for the original Squeak object representation as described in "Back to the Future The Story of Squeak, A Practical Smalltalk Written in Itself", see http://ftp.squeak.org/docs/OOPSLA.Squeak.html. Spur is a faster, more regular object representation that is designed for more performance and functionality, and to have a common header format for both 32-bit and 64-bit versions. You can read about it in SpurMemoryManager's class comment. There is also a video of a presentation at ESUG 2014 (https://www.youtube.com/watch?v=k0nBNS1aHZ4), along with slides (http://www.slideshare.net/esug/spur-a-new-object-representation-for-cog?rel…).!
Item was changed:
----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') -----
declareCVarsIn: aCCodeGenerator
| vmClass |
self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses"
vmClass := aCCodeGenerator vmClass. "Generate primitiveTable etc based on vmClass, not just StackInterpreter"
aCCodeGenerator
addHeaderFile:'<stddef.h> /* for e.g. alloca */';
addHeaderFile:'<setjmp.h>';
addHeaderFile:'<wchar.h> /* for wint_t */';
addHeaderFile:'"vmCallback.h"';
addHeaderFile:'"sqMemoryFence.h"';
addHeaderFile:'"dispdbg.h"'.
vmClass declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'.
aCCodeGenerator
var: #interpreterProxy type: #'struct VirtualMachine*'.
aCCodeGenerator
declareVar: #sendTrace type: 'volatile int';
declareVar: #byteCount type: 'unsigned long'.
"These need to be pointers or unsigned."
self declareC: #(instructionPointer method newMethod)
as: #usqInt
in: aCCodeGenerator.
"These are all pointers; char * because Slang has no support for C pointer arithmetic."
self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory breakSelector)
as: #'char *'
in: aCCodeGenerator.
aCCodeGenerator
var: #breakSelectorLength
declareC: 'sqInt breakSelectorLength = MinSmallInteger'.
self declareC: #(stackPage overflowedPage)
as: #'StackPage *'
in: aCCodeGenerator.
aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code."
NewspeakVM ifFalse:
[aCCodeGenerator
removeVariable: 'localAbsentReceiver';
removeVariable: 'localAbsentReceiverOrZero';
removeVariable: 'nsMethodCache'].
"This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS
is not defined, for the benefit of the interpreter on slow machines."
aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS).
MULTIPLEBYTECODESETS == false ifTrue:
[aCCodeGenerator
removeVariable: 'extA';
removeVariable: 'extB';
removeVariable: 'bytecodeSetSelector'].
aCCodeGenerator
var: #methodCache
declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'.
aCCodeGenerator
var: #nsMethodCache
declareC: 'long nsMethodCache[NSMethodCacheSize + 1 /* ', (NSMethodCacheSize + 1) printString, ' */]'.
+ AtCacheTotalSize isInteger ifTrue:
+ [aCCodeGenerator
+ var: #atCache
+ declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'].
aCCodeGenerator
- var: #atCache
- declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'.
- aCCodeGenerator
var: #primitiveTable
declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', vmClass primitiveTableString.
vmClass primitiveTable do:
[:symbolOrNot|
(symbolOrNot isSymbol
and: [symbolOrNot ~~ #primitiveFail]) ifTrue:
[(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil:
[:tMethod| tMethod returnType: #void]]].
vmClass objectMemoryClass hasSpurMemoryManagerAPI
ifTrue:
[aCCodeGenerator
var: #primitiveAccessorDepthTable
type: 'signed char'
sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */'
array: vmClass primitiveAccessorDepthTable]
ifFalse:
[aCCodeGenerator removeVariable: #primitiveAccessorDepthTable].
aCCodeGenerator
var: #primitiveFunctionPointer
declareC: 'void (*primitiveFunctionPointer)()'.
aCCodeGenerator
var: #externalPrimitiveTable
declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'.
aCCodeGenerator var: #showSurfaceFn type: #'void *'.
aCCodeGenerator
var: #jmpBuf
declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'.
aCCodeGenerator
var: #suspendedCallbacks
declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'.
aCCodeGenerator
var: #suspendedMethods
declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'.
aCCodeGenerator
var: #interruptCheckChain
declareC: 'void (*interruptCheckChain)(void) = 0'.
self declareCAsUSqLong: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs
longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs
"these are high-frequency enough that they're overflowing quite quickly on modern hardware"
statProcessSwitch statIOProcessEvents statForceInterruptCheck
statCheckForEvents statStackOverflow statStackPageDivorce)
in: aCCodeGenerator.
aCCodeGenerator var: #nextProfileTick type: #sqLong!
Item was changed:
----- Method: StackInterpreter class>>initializeCaches (in category 'initialization') -----
initializeCaches
+ | atCacheEntries atCacheEntrySize |
- | atCacheEntrySize |
NewspeakVM
ifTrue: [MethodCacheEntries := 512]
ifFalse: [MethodCacheEntries := 1024].
MethodCacheSelector := 1.
MethodCacheClass := 2.
MethodCacheMethod := 3.
MethodCachePrimFunction := 4.
MethodCacheEntrySize := 4. "Must be power of two for masking scheme."
MethodCacheMask := (MethodCacheEntries - 1) * MethodCacheEntrySize.
MethodCacheSize := MethodCacheEntries * MethodCacheEntrySize.
CacheProbeMax := 3.
NSMethodCacheEntries := 512.
NSMethodCacheSelector := 1.
NSMethodCacheClassTag := 2.
NSMethodCacheCallingMethod := 3.
NSMethodCacheDepthOrLookupRule := 4.
NSMethodCacheTargetMethod := 5.
NSMethodCachePrimFunction := 6.
NSMethodCacheActualReceiver := 7.
NSMethodCacheEntrySize := 8. "Must be power of two for masking scheme."
NSMethodCacheMask := NSMethodCacheEntries - 1 * NSMethodCacheEntrySize.
NSMethodCacheSize := NSMethodCacheEntries * NSMethodCacheEntrySize.
- AtCacheEntries := 8. "Must be a power of two"
AtCacheOop := 1.
AtCacheSize := 2.
AtCacheFmt := 3.
AtCacheFixedFields := 4.
+ atCacheEntries := 8.
atCacheEntrySize := 4. "Must be power of two for masking scheme."
+ AtCacheMask := (atCacheEntries-1) * atCacheEntrySize.
+ AtPutBase := atCacheEntries * atCacheEntrySize.
+ AtCacheTotalSize := atCacheEntries * atCacheEntrySize * 2.
- AtCacheMask := (AtCacheEntries-1) * atCacheEntrySize.
- AtPutBase := AtCacheEntries * atCacheEntrySize.
- AtCacheTotalSize := AtCacheEntries * atCacheEntrySize * 2.
"LookupRuleOuter is [0, 255], with the value being the lexical depth. Note that an
outer send to lexical depth 0 is equivalent to a self send. Implicit receiver and
outer sends are encoded as adjacent values to allow a quick range check to
determine whether the absent receiver might differ from the method receiver.
Note also Smalltalk super sends use ordinary send lookup rules."
LookupRuleSelf := 0.
LookupRuleImplicit := 256.
LookupRuleDynamicSuper := 257.
LookupRuleOrdinary := 258.
LookupRuleMNU := 259.
!
Item was changed:
----- Method: StackInterpreter class>>initializeFrameIndices (in category 'initialization') -----
initializeFrameIndices
"Format of a stack frame. Word-sized indices relative to the frame pointer.
Terminology
Frames are either single (have no context) or married (have a context).
Contexts are either single (exist on the heap), married (have a context) or widowed (had a frame that has exited).
Stacks grow down:
receiver for method activations/closure for block activations
arg0
...
argN
caller's method ip/base frame's sender context
fp-> saved fp
method
frame flags
context (uninitialized)
receiver
first temp
...
sp-> Nth temp
frame flags holds the number of arguments (since argument temporaries are above the frame)
the flag for a block activation
and the flag indicating if the context field is valid (whether the frame is married).
The first frame in a stack page is the baseFrame and is marked as such by a null saved fp,
in which case the saved method ip is actually the context (possibly hybrid) beneath the base frame"
| fxCallerSavedIP fxSavedFP fxMethod fxFrameFlags fxThisContext fxReceiver |
fxCallerSavedIP := 1.
fxSavedFP := 0.
fxMethod := -1.
fxFrameFlags := -2. "Can find numArgs, needed for fast temp access. args are above fxCallerSavedIP.
Can find ``is block'' bit
Can find ``has context'' bit"
fxThisContext := -3.
fxReceiver := -4.
FrameSlots := fxCallerSavedIP - fxReceiver + 1.
FoxCallerSavedIP := fxCallerSavedIP * BytesPerWord.
"In base frames the caller saved ip field holds the caller context."
FoxCallerContext := FoxCallerSavedIP.
FoxSavedFP := fxSavedFP * BytesPerWord.
FoxMethod := fxMethod * BytesPerWord.
FoxFrameFlags := fxFrameFlags * BytesPerWord.
FoxThisContext := fxThisContext * BytesPerWord.
FoxReceiver := fxReceiver * BytesPerWord.
+ "Mark the CoInterpreter-specific offsets as #undefined to
- "Mark the CoInterpreter-specific offsets as #undeclared to
avoid including them accidentally in StackInterpreter code."
+ IFrameSlots := #undefined.
+ MFrameSlots := #undefined.
+ FoxIFrameFlags := #undefined.
+ FoxIFSavedIP := #undefined.
+ FoxIFReceiver := #undefined.
+ FoxMFReceiver := #undefined!
- IFrameSlots := #undeclared.
- MFrameSlots := #undeclared.
- FoxIFrameFlags := #undeclared.
- FoxIFSavedIP := #undeclared.
- FoxIFReceiver := #undeclared.
- FoxMFReceiver := #undeclared!
Item was changed:
----- Method: StackInterpreter class>>initializeMiscConstants (in category 'initialization') -----
initializeMiscConstants
super initializeMiscConstants.
STACKVM := true.
"These flags function to identify a GC operation, or
to specify what operations the leak checker should be run for."
GCModeFull := 1. "stop-the-world global GC"
GCModeNewSpace := 2. "Spur's scavenge, or V3's incremental"
GCModeIncremental := 4. "incremental global gc (Dijkstra tri-colour marking); as yet unimplemented"
GCModeBecome := 8. "v3 post-become sweeping"
GCModeImageSegment := 16. "just a flag for leak checking image segments"
+ GCModeFreeSpace := 32. "just a flag for leak checking free space; Spur only"
StackPageTraceInvalid := -1.
StackPageUnreached := 0.
StackPageReachedButUntraced := 1.
StackPageTraced := 2.
DumpStackOnLowSpace := 0.
PrimitiveExternalCallIndex := 117. "Primitive index for #primitiveExternalCall"
MillisecondClockMask := 16r1FFFFFFF.
"Note: The external primitive table should actually be dynamically sized but for the sake of inferior platforms (e.g., Mac :-) who cannot allocate memory in any reasonable way, we keep it static (and cross our fingers...)"
MaxExternalPrimitiveTableSize := 4096. "entries"
MaxJumpBuf := 32. "max. callback depth"
FailImbalancedPrimitives := initializationOptions at: #FailImbalancedPrimitives ifAbsentPut: [true].
EnforceAccessControl := initializationOptions at: #EnforceAccessControl ifAbsent: [true]!
Item was changed:
----- Method: StackInterpreter>>install:inAtCache:at:string: (in category 'indexing primitive support') -----
install: rcvr inAtCache: cache at: atIx string: stringy
"Attempt to install the oop of this object in the given cache (at or atPut),
along with its size, format and fixedSize. Answer if this was successful."
| hdr fmt totalLength fixedFields |
<inline: true>
<var: #cache type: 'sqInt *'>
self assert: (objectMemory isContext: rcvr) not.
hdr := objectMemory baseHeader: rcvr.
fmt := objectMemory formatOfHeader: hdr.
+ "For now the AtCache code doesn't support 16-bit indexability."
+ (objectMemory hasSpurMemoryManagerAPI
+ and: [fmt between: objectMemory firstShortFormat and: objectMemory firstByteFormat - 1]) ifTrue:
+ [^self primitiveFailed].
stringy
ifTrue:
[totalLength := objectMemory lengthOf: rcvr baseHeader: hdr format: fmt.
fixedFields := 0.
fmt := fmt + objectMemory firstStringyFakeFormat] "special flag for strings"
ifFalse:
[(fmt = objectMemory indexablePointersFormat and: [objectMemory isContextHeader: hdr]) ifTrue:
["Contexts must not be put in the atCache, since their size is not constant"
self primitiveFailFor: PrimErrBadReceiver.
^false].
totalLength := objectMemory lengthOf: rcvr baseHeader: hdr format: fmt.
fixedFields := objectMemory fixedFieldsOf: rcvr format: fmt length: totalLength].
cache at: atIx+AtCacheOop put: rcvr.
cache at: atIx+AtCacheFmt put: fmt.
cache at: atIx+AtCacheFixedFields put: fixedFields.
cache at: atIx+AtCacheSize put: totalLength - fixedFields.
^true!
Item was changed:
----- Method: StackInterpreter>>writeImageFileIO (in category 'image save/restore') -----
writeImageFileIO
"Write the image header and heap contents to imageFile for snapshot. c.f. writeImageFileIOSimulation.
The game below is to maintain 64-bit alignment for all putLong:toFile: occurrences."
+ <inline: #never>
| imageName headerStart headerSize f imageBytes bytesWritten sCWIfn okToWrite |
<var: #f type: #sqImageFile>
<var: #headerStart type: #squeakFileOffsetType>
<var: #sCWIfn type: #'void *'>
<var: #imageName declareC: 'extern char imageName[]'>
self cCode: [] inSmalltalk: [imageName := 'sooth compiler'. ^self writeImageFileIOSimulation].
"If the security plugin can be loaded, use it to check for write permission.
If not, assume it's ok"
sCWIfn := self ioLoadFunction: 'secCanWriteImage' From: 'SecurityPlugin'.
sCWIfn ~= 0 ifTrue:
[okToWrite := self cCode: '((sqInt (*)(void))sCWIfn)()'.
okToWrite ifFalse:[^self primitiveFail]].
"local constants"
headerStart := 0.
headerSize := objectMemory wordSize = 4 ifTrue: [64] ifFalse: [128]. "header size in bytes; do not change!!"
f := self sqImageFile: imageName Open: 'wb'.
f = nil ifTrue: "could not open the image file for writing"
[^self primitiveFail].
imageBytes := objectMemory imageSizeToWrite.
headerStart := self sqImage: f File: imageName StartLocation: headerSize + imageBytes.
self cCode: '/* Note: on Unix systems one could put an exec command here, padded to 512 bytes */'.
"position file to start of header"
self sqImageFile: f Seek: headerStart.
self putWord32: self imageFormatVersion toFile: f.
self putWord32: headerSize toFile: f.
self putLong: imageBytes toFile: f.
self putLong: objectMemory baseAddressOfImage toFile: f.
self putLong: objectMemory specialObjectsOop toFile: f.
self putLong: objectMemory newObjectHash toFile: f.
self putLong: self ioScreenSize toFile: f.
self putLong: self getImageHeaderFlags toFile: f.
self putWord32: extraVMMemory toFile: f.
self putShort: desiredNumStackPages toFile: f.
self putShort: self unknownShortOrCodeSizeInKs toFile: f.
self putWord32: desiredEdenBytes toFile: f.
self putShort: (maxExtSemTabSizeSet ifTrue: [self ioGetMaxExtSemTableSize] ifFalse: [0]) toFile: f.
self putShort: the2ndUnknownShort toFile: f.
objectMemory hasSpurMemoryManagerAPI
ifTrue:
[self putLong: objectMemory firstSegmentBytes toFile: f.
self putLong: objectMemory bytesLeftInOldSpace toFile: f.
2 timesRepeat: [self putLong: 0 toFile: f] "Pad the rest of the header."]
ifFalse:
[4 timesRepeat: [self putLong: 0 toFile: f]]. "Pad the rest of the header."
objectMemory wordSize = 8 ifTrue:
[3 timesRepeat: [self putLong: 0 toFile: f]]. "Pad the rest of the header."
self assert: headerStart + headerSize = (self sqImageFilePosition: f).
"position file after the header"
self sqImageFile: f Seek: headerStart + headerSize.
self successful ifFalse: "file write or seek failure"
[self sqImageFileClose: f.
^nil].
"write the image data"
objectMemory hasSpurMemoryManagerAPI
ifTrue:
[bytesWritten := objectMemory writeImageSegmentsToFile: f]
ifFalse:
[bytesWritten := self sq: (self pointerForOop: objectMemory baseAddressOfImage)
Image: (self sizeof: #char)
File: imageBytes
Write: f].
self success: bytesWritten = imageBytes.
self sqImageFileClose: f!
Item was changed:
----- Method: TMethod>>inlineSend:directReturn:exitVar:in: (in category 'inlining') -----
inlineSend: aSendNode directReturn: directReturn exitVar: exitVar in: aCodeGen
"Answer a collection of statements to replace the given send. directReturn indicates
that the send is the expression in a return statement, so returns can be left in the
body of the inlined method. If exitVar is nil, the value returned by the send is not
used; thus, returns need not assign to the output variable.
Types are propagated to as-yet-untyped variables when inlining a send that is assigned,
otherwise the assignee variable type must match the return type of the inlinee. Return
types are not propagated."
| sel meth methArgs exitLabel inlineStmts label exitType |
sel := aSendNode selector.
meth := aCodeGen methodNamed: sel.
methArgs := meth args.
"convenient for debugging..."
aCodeGen maybeBreakForInlineOf: aSendNode in: self.
(methArgs notEmpty and: [methArgs first beginsWith: 'self_in_']) ifTrue:
[methArgs := methArgs allButFirst].
methArgs size = aSendNode args size ifFalse:
[^nil].
meth := meth copy.
"Propagate the return type of an inlined method"
(directReturn or: [exitVar notNil]) ifTrue:
[exitType := directReturn
ifTrue: [returnType]
ifFalse: [(self typeFor: exitVar in: aCodeGen) ifNil: [#sqInt]].
(exitType = #void or: [exitType = meth returnType]) ifFalse:
[meth propagateReturnIn: aCodeGen]].
"Propagate any unusual argument types to untyped argument variables"
methArgs
with: aSendNode args
do: [:formal :actual|
(meth declarationAt: formal ifAbsent: nil) ifNil:
[(self typeFor: actual in: aCodeGen) ifNotNil:
[:type|
type ~= #sqInt ifTrue:
[meth declarationAt: formal put: (type last = $* ifTrue: [type, formal] ifFalse: [type, ' ', formal])]]]].
meth renameVarsForInliningInto: self except: #() in: aCodeGen.
meth renameLabelsForInliningInto: self.
self addVarsDeclarationsAndLabelsOf: meth except: #().
meth hasReturn ifTrue:
[directReturn ifFalse:
[exitLabel := self unusedLabelForInliningInto: self.
(meth exitVar: exitVar label: exitLabel) "is label used?"
ifTrue: [ labels add: exitLabel ]
ifFalse: [ exitLabel := nil ]]].
(inlineStmts := OrderedCollection new: 100)
add: (label := TLabeledCommentNode new setComment: 'begin ', sel);
addAll: (self argAssignmentsFor: meth send: aSendNode in: aCodeGen);
addAll: meth statements. "method body"
(directReturn
and: [meth endsWithReturn not]) ifTrue:
[inlineStmts add:
(TReturnNode new setExpression: (TVariableNode new setName: 'nil'))].
exitLabel ~= nil ifTrue:
[inlineStmts add:
(TLabeledCommentNode new setLabel:
exitLabel comment: 'end ', meth selector)].
+ inlineStmts size = 1 ifTrue: "Nuke empty methods; e.g. override of flushAtCache"
+ [self assert: inlineStmts first class == TLabeledCommentNode.
+ inlineStmts removeFirst].
^inlineStmts!
Item was changed:
SharedPool subclass: #VMBasicConstants
instanceVariableNames: ''
+ classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFreeSpace GCModeFull GCModeImageSegment GCModeIncremental GCModeNewSpace IMMUTABILITY MULTIPLEBYTECODESETS NewspeakVM PharoVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported PrimErrWritePastObject PrimNoErr SPURVM STACKVM SistaVM VMBIGENDIAN'
- classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFull GCModeImageSegment GCModeIncremental GCModeNewSpace IMMUTABILITY MULTIPLEBYTECODESETS NewspeakVM PharoVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported PrimErrWritePastObject PrimNoErr SPURVM STACKVM SistaVM VMBIGENDIAN'
poolDictionaries: ''
category: 'VMMaker-Interpreter'!
!VMBasicConstants commentStamp: '<historical>' prior: 0!
I am a shared pool for basic constants upon which the VM as a whole depends.
self ensureClassPool.
self classPool declare: #BytesPerWord from: VMSqueakV3ObjectRepresentationConstants classPool.
self classPool declare: #BaseHeaderSize from: VMSqueakV3ObjectRepresentationConstants classPool
(ObjectMemory classPool keys select: [:k| k beginsWith: 'Byte']) do:
[:k| self classPool declare: k from: ObjectMemory classPool]!
Item was changed:
----- Method: VMMaker>>generateMainVM (in category 'generate sources') -----
generateMainVM
"Generate the interp (and optionally the cogit), internal plugins and exports.
N.B. generateInterpreterFile *must* precede generateCogitFile so that
the objectMemory and interpreter classes are initialized before the Cogit
code is generated."
+ self logDateAndTime;
+ generateInterpreterFile;
- self generateInterpreterFile;
generateCogitFiles;
processFilesForCoreVM;
generateInternalPlugins;
+ generateExportsFile;
+ logDateAndTime!
- generateExportsFile!
1
0
24 Jan '16
Revision: 3569
Author: eliot
Date: 2016-01-24 11:07:04 -0800 (Sun, 24 Jan 2016)
Log Message:
-----------
Add a -gdb option to the unix lanch scripts. This must be the first parameter.
Cause it to invoke gdb on the VM instead of the VM itself, to echo the supplied
arguments as a run command for gdb, and to clear the arguments to gdb.
Add the relevant ignore properties to the no access control linux newspeak build.
Modified Paths:
--------------
branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm
branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm
branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm
branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm
branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm
branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm
branches/Cog/platforms/unix/config/bin.squeak.sh.in
branches/Cog/platforms/unix/config/squeak.sh.in
Property Changed:
----------------
branches/Cog/build.linux32x86/nsnac.cog.spur/build/
branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/
branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/
branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/
branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/
branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/
Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build
___________________________________________________________________
Added: svn:ignore
+ *
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm 2016-01-23 23:16:44 UTC (rev 3568)
+++ branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm 2016-01-24 19:07:04 UTC (rev 3569)
@@ -1,6 +1,6 @@
#!/bin/bash
# VM with VM profiler and threaded heartbeat
-INSTALLDIR=nscogspurlinuxht
+INSTALLDIR=nsnaccogspurlinuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert
___________________________________________________________________
Added: svn:ignore
+ *
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm 2016-01-23 23:16:44 UTC (rev 3568)
+++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm 2016-01-24 19:07:04 UTC (rev 3569)
@@ -1,6 +1,6 @@
#!/bin/bash
# assert Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=assert/nscogspurlinuxht
+INSTALLDIR=assert/nsnaccogspurlinuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
if [ $# -ge 1 ]; then
Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat
___________________________________________________________________
Added: svn:ignore
+ *
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm 2016-01-23 23:16:44 UTC (rev 3568)
+++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm 2016-01-24 19:07:04 UTC (rev 3569)
@@ -1,6 +1,6 @@
#!/bin/bash
# assert Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=assert/nscogspurlinux
+INSTALLDIR=assert/nsnaccogspurlinux
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
if [ $# -ge 1 ]; then
Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug
___________________________________________________________________
Added: svn:ignore
+ *
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm 2016-01-23 23:16:44 UTC (rev 3568)
+++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm 2016-01-24 19:07:04 UTC (rev 3569)
@@ -1,6 +1,6 @@
#!/bin/bash
# debug Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=debug/nscogspurlinuxht
+INSTALLDIR=debug/nsnaccogspurlinuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"
if [ $# -ge 1 ]; then
Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat
___________________________________________________________________
Added: svn:ignore
+ *
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm 2016-01-23 23:16:44 UTC (rev 3568)
+++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm 2016-01-24 19:07:04 UTC (rev 3569)
@@ -1,6 +1,6 @@
#!/bin/bash
# debug Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=debug/nscogspurlinux
+INSTALLDIR=debug/nsnaccogspurlinux
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"
if [ $# -ge 1 ]; then
Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat
___________________________________________________________________
Added: svn:ignore
+ *
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm 2016-01-23 23:16:44 UTC (rev 3568)
+++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm 2016-01-24 19:07:04 UTC (rev 3569)
@@ -1,6 +1,6 @@
#!/bin/bash
# Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=nscogspurlinux
+INSTALLDIR=nsnaccogspurlinux
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Modified: branches/Cog/platforms/unix/config/bin.squeak.sh.in
===================================================================
--- branches/Cog/platforms/unix/config/bin.squeak.sh.in 2016-01-23 23:16:44 UTC (rev 3568)
+++ branches/Cog/platforms/unix/config/bin.squeak.sh.in 2016-01-24 19:07:04 UTC (rev 3569)
@@ -2,9 +2,16 @@
# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
BIN=`/usr/bin/dirname $0`/../@expanded_relative_imgdir@
+GDB=
if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
export SQUEAK_PLUGINS="$BIN"
fi
+if [ "$1" = '-gdb' ]; then
+ GDB=gdb
+ shift
+ echo;echo run $@; echo
+ set --
+fi
# At least on linux LD_LIBRARY_PATH's components must be absolute path names
case "$BIN" in
/*) PLUGINS="$BIN";;
@@ -45,4 +52,4 @@
# prepending is less flexible but safer because it ensures we find the plugins
# in the same directory as the VM. We must include at least /lib and /usr/lib
# if libraries there-in are to be found. These directories are not implicit.
-LD_LIBRARY_PATH="$PLUGINS:$SVMLLP:${LD_LIBRARY_PATH}" exec "$BIN/squeak" "$@"
+LD_LIBRARY_PATH="$PLUGINS:$SVMLLP:${LD_LIBRARY_PATH}" exec $GDB "$BIN/squeak" "$@"
Modified: branches/Cog/platforms/unix/config/squeak.sh.in
===================================================================
--- branches/Cog/platforms/unix/config/squeak.sh.in 2016-01-23 23:16:44 UTC (rev 3568)
+++ branches/Cog/platforms/unix/config/squeak.sh.in 2016-01-24 19:07:04 UTC (rev 3569)
@@ -2,9 +2,16 @@
# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
BIN=`/usr/bin/dirname $0`/@expanded_relative_imgdir@
+GDB=
if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
export SQUEAK_PLUGINS="$BIN"
fi
+if [ "$1" = '-gdb' ]; then
+ GDB=gdb
+ shift
+ echo;echo run $@; echo
+ set --
+fi
# At least on linux LD_LIBRARY_PATH's components must be absolute path names
case "$BIN" in
/*) PLUGINS="$BIN";;
@@ -45,4 +52,4 @@
# prepending is less flexible but safer because it ensures we find the plugins
# in the same directory as the VM. We must include at least /lib and /usr/lib
# if libraries there-in are to be found. These directories are not implicit.
-LD_LIBRARY_PATH="$PLUGINS:$SVMLLP:${LD_LIBRARY_PATH}" exec "$BIN/squeak" "$@"
+LD_LIBRARY_PATH="$PLUGINS:$SVMLLP:${LD_LIBRARY_PATH}" exec $GDB "$BIN/squeak" "$@"
1
0
[commit][3568] Update sources per VMMaker 4.15.2 (VMMaker-dtl.375)
by commits＠squeakvm.org 24 Jan '16
by commits＠squeakvm.org 24 Jan '16
24 Jan '16
Revision: 3568
Author: lewis
Date: 2016-01-23 15:16:44 -0800 (Sat, 23 Jan 2016)
Log Message:
-----------
Update sources per VMMaker 4.15.2 (VMMaker-dtl.375)
Move the critical section primitives and related methods to InterpreterPrimitives from StackInterpreter, and make them work in the context interpreter. Install as numbered primitives 185, 186, 187.
Modified Paths:
--------------
trunk/src/ckformat.c
trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
trunk/src/plugins/AioPlugin/AioPlugin.c
trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
trunk/src/plugins/B2DPlugin/B2DPlugin.c
trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
trunk/src/plugins/CameraPlugin/CameraPlugin.c
trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
trunk/src/plugins/DBusPlugin/DBusPlugin.c
trunk/src/plugins/DESPlugin/DESPlugin.c
trunk/src/plugins/DSAPrims/DSAPrims.c
trunk/src/plugins/DropPlugin/DropPlugin.c
trunk/src/plugins/FFTPlugin/FFTPlugin.c
trunk/src/plugins/FT2Plugin/FT2Plugin.c
trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
trunk/src/plugins/FilePlugin/FilePlugin.c
trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c
trunk/src/plugins/GeniePlugin/GeniePlugin.c
trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c
trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c
trunk/src/plugins/Klatt/Klatt.c
trunk/src/plugins/LargeIntegers/LargeIntegers.c
trunk/src/plugins/LocalePlugin/LocalePlugin.c
trunk/src/plugins/MD5Plugin/MD5Plugin.c
trunk/src/plugins/MIDIPlugin/MIDIPlugin.c
trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
trunk/src/plugins/RePlugin/RePlugin.c
trunk/src/plugins/RomePlugin/RomePlugin.c
trunk/src/plugins/SHA256Plugin/SHA256Plugin.c
trunk/src/plugins/ScratchPlugin/ScratchPlugin.c
trunk/src/plugins/SecurityPlugin/SecurityPlugin.c
trunk/src/plugins/SerialPlugin/SerialPlugin.c
trunk/src/plugins/SocketPlugin/SocketPlugin.c
trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c
trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
trunk/src/plugins/SoundPlugin/SoundPlugin.c
trunk/src/plugins/Squeak3D/Squeak3D.c
trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
trunk/src/plugins/SqueakSSL/SqueakSSL.c
trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c
trunk/src/plugins/UUIDPlugin/UUIDPlugin.c
trunk/src/plugins/UnicodePlugin/UnicodePlugin.c
trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
trunk/src/plugins/WeDoPlugin/WeDoPlugin.c
trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c
trunk/src/plugins/ZipPlugin/ZipPlugin.c
trunk/src/vm/interp.c
trunk/src/vm/interp.h
trunk/src/vm/sqNamedPrims.h
Modified: trunk/src/ckformat.c
===================================================================
--- trunk/src/ckformat.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/ckformat.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -5,7 +5,7 @@
/* Usage: ckformat imageFileName */
/* --- DO NOT EDIT THIS FILE --- */
-/* --- Automatically generated from class ImageFormat 2016-01-23T14:15:38.093+01:00--- */
+/* --- Automatically generated from class ImageFormat 2016-01-23T18:11:28.366+01:00--- */
/* --- Source code is in package ImageFormat in the VMMaker repository --- */
/* --- DO NOT EDIT THIS FILE --- */
Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
===================================================================
--- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:15 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:17 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- ADPCMCodecPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ ADPCMCodecPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/AioPlugin/AioPlugin.c
===================================================================
--- trunk/src/plugins/AioPlugin/AioPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/AioPlugin/AioPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:36 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:27 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
UnixAioPlugin * uuid: nil
*/
Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:15 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:17 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- AsynchFilePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ AsynchFilePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:19 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:19 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- BalloonEnginePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ BalloonEnginePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
===================================================================
--- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:28 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:23 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- B3DAcceleratorPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ B3DAcceleratorPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:15 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:17 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- BMPReadWriterPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ BMPReadWriterPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:20 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:20 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- BitBltSimulation VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ BitBltSimulation VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c
===================================================================
--- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:29 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:24 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- CameraPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ CameraPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "CameraPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "CameraPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
===================================================================
--- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:29 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:24 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- ClipboardExtendedPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ ClipboardExtendedPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
===================================================================
--- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:21 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:20 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- CroquetPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ CroquetPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c
===================================================================
--- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:29 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:24 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665
*/
Modified: trunk/src/plugins/DESPlugin/DESPlugin.c
===================================================================
--- trunk/src/plugins/DESPlugin/DESPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/DESPlugin/DESPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:21 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:20 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
DESPlugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465
*/
Modified: trunk/src/plugins/DSAPrims/DSAPrims.c
===================================================================
--- trunk/src/plugins/DSAPrims/DSAPrims.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/DSAPrims/DSAPrims.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:21 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:20 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
DSAPlugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465
*/
Modified: trunk/src/plugins/DropPlugin/DropPlugin.c
===================================================================
--- trunk/src/plugins/DropPlugin/DropPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/DropPlugin/DropPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:20 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- DropPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ DropPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "DropPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c
===================================================================
--- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:20 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- FFTPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ FFTPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "FFTPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "FFTPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c
===================================================================
--- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,4 +1,4 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:30 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:25 pm */
/* Automatically generated by
FT2PluginCodeGenerator * FreeType-nice.443 uuid: d8120335-a67f-4a64-94ea-90145046f7dc
from
Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
===================================================================
--- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:31 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:25 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- FileCopyPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ FileCopyPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/FilePlugin/FilePlugin.c
===================================================================
--- trunk/src/plugins/FilePlugin/FilePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/FilePlugin/FilePlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:20 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- FilePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ FilePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "FilePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
===================================================================
--- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:20 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- FloatArrayPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ FloatArrayPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c
===================================================================
--- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:21 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- FloatMathPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ FloatMathPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c
===================================================================
--- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:23 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:21 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- GeniePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ GeniePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "GeniePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "GeniePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c
===================================================================
--- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:32 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:25 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- HostWindowPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ HostWindowPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
===================================================================
--- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:23 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:21 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- JPEGReadWriter2Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ JPEGReadWriter2Plugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
===================================================================
--- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:23 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:21 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- JPEGReaderPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ JPEGReaderPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
===================================================================
--- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:23 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:21 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- JoystickTabletPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ JoystickTabletPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c
===================================================================
--- trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:33 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:26 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
KedamaPlugin2 Kedama-Plugins-yo.1 uuid: 3fc7d691-0149-ba4d-a339-5d27cd44a2f8
*/
Modified: trunk/src/plugins/Klatt/Klatt.c
===================================================================
--- trunk/src/plugins/Klatt/Klatt.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/Klatt/Klatt.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:24 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:21 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- KlattSynthesizerPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ KlattSynthesizerPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:24 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:22 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- LargeIntegersPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ LargeIntegersPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c
===================================================================
--- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:25 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:22 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- LocalePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ LocalePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "LocalePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "LocalePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/MD5Plugin/MD5Plugin.c
===================================================================
--- trunk/src/plugins/MD5Plugin/MD5Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/MD5Plugin/MD5Plugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:25 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:22 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
MD5Plugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465
*/
Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c
===================================================================
--- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:33 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:26 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- MIDIPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ MIDIPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
===================================================================
--- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:25 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:22 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- Matrix2x3Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ Matrix2x3Plugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
===================================================================
--- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:25 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:22 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- MiscPrimitivePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ MiscPrimitivePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
===================================================================
--- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:34 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:26 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- Mpeg3Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ Mpeg3Plugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "Mpeg3Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "Mpeg3Plugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/RePlugin/RePlugin.c
===================================================================
--- trunk/src/plugins/RePlugin/RePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/RePlugin/RePlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:26 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:22 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- RePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ RePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "RePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "RePlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/RomePlugin/RomePlugin.c
===================================================================
--- trunk/src/plugins/RomePlugin/RomePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/RomePlugin/RomePlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:35 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:27 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
RomePlugin Rome-Plugin-dtl.40 uuid: fc8fcc8b-edca-42ec-90db-24190e3e33fd
*/
Modified: trunk/src/plugins/SHA256Plugin/SHA256Plugin.c
===================================================================
--- trunk/src/plugins/SHA256Plugin/SHA256Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/SHA256Plugin/SHA256Plugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:26 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:22 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
SHA256Plugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465
*/
Modified: trunk/src/plugins/ScratchPlugin/ScratchPlugin.c
===================================================================
--- trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:36 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:27 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- ScratchPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ ScratchPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "ScratchPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "ScratchPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/SecurityPlugin/SecurityPlugin.c
===================================================================
--- trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:26 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:22 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- SecurityPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SecurityPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "SecurityPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "SecurityPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/SerialPlugin/SerialPlugin.c
===================================================================
--- trunk/src/plugins/SerialPlugin/SerialPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/SerialPlugin/SerialPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:26 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:22 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- SerialPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SerialPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "SerialPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "SerialPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/SocketPlugin/SocketPlugin.c
===================================================================
--- trunk/src/plugins/SocketPlugin/SocketPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/SocketPlugin/SocketPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:27 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:23 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- SocketPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SocketPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "SocketPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "SocketPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c
===================================================================
--- trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:27 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:23 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- SoundCodecPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SoundCodecPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "SoundCodecPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "SoundCodecPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
===================================================================
--- trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:27 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:23 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- SoundGenerationPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SoundGenerationPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "SoundGenerationPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "SoundGenerationPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/SoundPlugin/SoundPlugin.c
===================================================================
--- trunk/src/plugins/SoundPlugin/SoundPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/SoundPlugin/SoundPlugin.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:27 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:23 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- SoundPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SoundPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "SoundPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "SoundPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/Squeak3D/Squeak3D.c
===================================================================
--- trunk/src/plugins/Squeak3D/Squeak3D.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/Squeak3D/Squeak3D.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:29 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:24 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
B3DEnginePlugin * Balloon3D-Plugins-tpr.10 uuid: f5d79078-993d-4ea7-9018-4f4f13c0d333
*/
Modified: trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
===================================================================
--- trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:30 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:24 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- FFIPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ FFIPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "FFIPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
+static char __buildInfo[] = "FFIPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb " __DATE__ ;
Modified: trunk/src/plugins/SqueakSSL/SqueakSSL.c
===================================================================
--- trunk/src/plugins/SqueakSSL/SqueakSSL.c 2016-01-23 19:24:12 UTC (rev 3567)
+++ trunk/src/plugins/SqueakSSL/SqueakSSL.c 2016-01-23 23:16:44 UTC (rev 3568)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:36 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.2 translated as C source on 23 January 2016 6:11:27 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ VMPluginCodeGenerator VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
from
- SqueakSSLPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
+ SqueakSSLPlugin VMMaker-dtl.375 uuid: e3a6cde6-c09a-403d-a673-571c7abb98cb
*/
-static char __buildInfo[] = "SqueakSSLPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ Diff output truncated at 50000 characters. @@
1
0
David T. Lewis uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker-dtl.375.mcz
==================== Summary ====================
Name: VMMaker-dtl.375
Author: dtl
Time: 23 January 2016, 6:09:35.618 pm
UUID: e3a6cde6-c09a-403d-a673-571c7abb98cb
Ancestors: VMMaker-dtl.374
VMMaker 4.15.2
Move the critical section primitives and related methods to InterpreterPrimitives from StackInterpreter, and make them work in the context interpreter.. Install as numbered primitives 185, 186, 187.
=============== Diff against VMMaker-dtl.374 ===============
Item was changed:
----- Method: Interpreter class>>initializePrimitiveTable (in category 'initialization') -----
(excessive size, no diff calculated)
Item was removed:
- ----- Method: Interpreter>>addLastLink:toList: (in category 'process primitive support') -----
- addLastLink: proc toList: aList
- "Add the given process to the given linked list and set the
- backpointer of process to its new list."
- | lastLink |
- (self isEmptyList: aList)
- ifTrue: [objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: proc]
- ifFalse: [lastLink := objectMemory fetchPointer: LastLinkIndex ofObject: aList.
- objectMemory storePointer: NextLinkIndex ofObject: lastLink withValue: proc].
- objectMemory storePointer: LastLinkIndex ofObject: aList withValue: proc.
- objectMemory storePointer: MyListIndex ofObject: proc withValue: aList!
Item was added:
+ ----- Method: Interpreter>>putToSleep:yieldingIf: (in category 'process primitive support') -----
+ putToSleep: aProcess yieldingIf: yieldImplicitly
+ "Save the given process on the scheduler process list for its priority,
+ adding to the back if yieldImplicitly or to the front if not yieldImplicitly."
+
+ | priority processLists processList |
+ priority := self quickFetchInteger: PriorityIndex ofObject: aProcess.
+ processLists := objectMemory fetchPointer: ProcessListsIndex ofObject: self schedulerPointer.
+ processList := objectMemory fetchPointer: priority - 1 ofObject: processLists.
+ yieldImplicitly
+ ifTrue: [self addLastLink: aProcess toList: processList]
+ ifFalse: [self addFirstLink: aProcess toList: processList]!
Item was removed:
- ----- Method: Interpreter>>schedulerPointer (in category 'process primitive support') -----
- schedulerPointer
-
- ^ objectMemory fetchPointer: ValueIndex ofObject: (objectMemory splObj: SchedulerAssociation)!
Item was changed:
VMClass subclass: #InterpreterPrimitives
+ instanceVariableNames: 'objectMemory primFailCode argumentCount interruptKeycode newMethod preemptionYields'
- instanceVariableNames: 'objectMemory primFailCode argumentCount interruptKeycode newMethod'
classVariableNames: 'CrossedX EndOfRun InterpreterSourceVersion MillisecondClockMask'
poolDictionaries: 'VMObjectIndices VMSqueakV3ObjectRepresentationConstants'
category: 'VMMaker-Interpreter'!
!InterpreterPrimitives commentStamp: 'dtl 4/14/2013 23:16' prior: 0!
InterpreterPrimitives implements most of the VM's core primitives. It is the root of the interpreter hierarchy so as to share the core primitives amongst the various interpreters.
Instance Variables
argumentCount: <Integer>
messageSelector: <Integer>
newMethod: <Integer>
nextProfileTick: <Integer>
objectMemory: <ObjectMemory> (simulation only)
preemptionYields: <Boolean>
primFailCode: <Integer>
profileMethod: <Integer>
profileProcess: <Integer>
profileSemaphore: <Integer>
argumentCount
- the number of arguments of the current message
messageSelector
- the oop of the selector of the current message
newMethod
- the oop of the result of looking up the current message
nextProfileTick
- the millisecond clock value of the next profile tick (if profiling is in effect)
objectMemory
- the memory manager and garbage collector that manages the heap
preemptionYields
- a boolean controlling the process primitives. If true (old, incorrect, blue-book semantics) a preempted process is sent to the back of its run-queue. If false, a process preempted by a higher-priority process is put back at the head of its run queue, hence preserving cooperative scheduling within priorities.
primFailCode
- primtiive success/failure flag, 0 for success, otherwise the reason code for failure
profileMethod
- the oop of the method at the time nextProfileTick was reached
profileProcess
- the oop of the activeProcess at the time nextProfileTick was reached
profileSemaphore
- the oop of the semaphore to signal when nextProfileTick is reached
!
Item was added:
+ ----- Method: InterpreterPrimitives>>activeProcess (in category 'process primitive support') -----
+ activeProcess
+ "Answer the current activeProcess."
+ <api> "useful for VM debugging"
+ ^objectMemory fetchPointer: ActiveProcessIndex ofObject: self schedulerPointer!
Item was added:
+ ----- Method: InterpreterPrimitives>>addFirstLink:toList: (in category 'process primitive support') -----
+ addFirstLink: proc toList: aList
+ "Add the given process to the front of the given linked list
+ and set the backpointer of process to its new list."
+ | firstLink |
+ self assert: (objectMemory fetchPointer: NextLinkIndex ofObject: proc) = objectMemory nilObject.
+ firstLink := objectMemory fetchPointer: FirstLinkIndex ofObject: aList.
+ self assert: firstLink ~= proc.
+ objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: proc.
+ firstLink = objectMemory nilObject "a.k.a. (self isEmptyList: aList)"
+ ifTrue: [objectMemory storePointer: LastLinkIndex ofObject: aList withValue: proc]
+ ifFalse: [objectMemory storePointer: NextLinkIndex ofObject: proc withValue: firstLink].
+ objectMemory storePointer: MyListIndex ofObject: proc withValue: aList!
Item was added:
+ ----- Method: InterpreterPrimitives>>addLastLink:toList: (in category 'process primitive support') -----
+ addLastLink: proc toList: aList
+ "Add the given process to the end of the given linked list
+ and set the backpointer of process to its new list."
+ | lastLink |
+ self assert: (objectMemory fetchPointer: NextLinkIndex ofObject: proc) = objectMemory nilObject.
+ (self isEmptyList: aList)
+ ifTrue: [objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: proc]
+ ifFalse:
+ [lastLink := objectMemory fetchPointer: LastLinkIndex ofObject: aList.
+ self assert: lastLink ~= proc.
+ objectMemory storePointer: NextLinkIndex ofObject: lastLink withValue: proc].
+ objectMemory storePointer: LastLinkIndex ofObject: aList withValue: proc.
+ objectMemory storePointer: MyListIndex ofObject: proc withValue: aList!
Item was added:
+ ----- Method: InterpreterPrimitives>>primitiveEnterCriticalSection (in category 'process primitives') -----
+ primitiveEnterCriticalSection
+ "Attempt to enter a CriticalSection/Mutex. If not owned, set the owner to the current
+ process and answer false. If owned by the current process answer true. Otherwise
+ suspend the process. Answer if the receiver is owned by the current process.
+ For simulation if there is an argument it is taken to be the effective activeProcess
+ (see Process>>effectiveProcess)."
+ | criticalSection owningProcessIndex owningProcess activeProc |
+ argumentCount > 0
+ ifTrue:
+ [criticalSection := self stackValue: 1. "rcvr"
+ activeProc := self stackTop]
+ ifFalse:
+ [criticalSection := self stackTop. "rcvr"
+ activeProc := self activeProcess].
+ owningProcessIndex := ExcessSignalsIndex. "CriticalSections are laid out like Semaphores"
+ owningProcess := objectMemory fetchPointer: owningProcessIndex ofObject: criticalSection.
+ owningProcess = objectMemory nilObject ifTrue:
+ [objectMemory storePointer: owningProcessIndex
+ ofObject: criticalSection
+ withValue: activeProc.
+ ^self pop: argumentCount + 1 thenPush: objectMemory falseObject].
+ owningProcess = activeProc ifTrue:
+ [^self pop: argumentCount + 1 thenPush: objectMemory trueObject].
+ "Arrange to answer false (unowned) when the process is resumed."
+ self pop: argumentCount + 1 thenPush: objectMemory falseObject.
+ self addLastLink: activeProc toList: criticalSection.
+ self transferTo: self wakeHighestPriority!
Item was added:
+ ----- Method: InterpreterPrimitives>>primitiveExitCriticalSection (in category 'process primitives') -----
+ primitiveExitCriticalSection
+ "Exit the critical section.
+ This may change the active process as a result."
+ | criticalSection owningProcessIndex owningProcess |
+ criticalSection := self stackTop. "rcvr"
+ owningProcessIndex := ExcessSignalsIndex. "CriticalSections are laid out like Semaphores"
+ (self isEmptyList: criticalSection)
+ ifTrue:
+ [objectMemory storePointerUnchecked: owningProcessIndex
+ ofObject: criticalSection
+ withValue: objectMemory nilObject]
+ ifFalse:
+ [owningProcess := self removeFirstLinkOfList: criticalSection.
+ "store check unnecessary because criticalSection referred to owningProcess
+ via its FirstLinkIndex slot before owningProcess was removed."
+ objectMemory storePointerUnchecked: owningProcessIndex
+ ofObject: criticalSection
+ withValue: owningProcess.
+ "Note that resume: isn't fair; it won't suspend the active process.
+ For fairness we must do the equivalent of a primitiveYield, but that
+ may break old code, so we stick with unfair resume:."
+ self resume: owningProcess preemptedYieldingIf: preemptionYields]!
Item was added:
+ ----- Method: InterpreterPrimitives>>primitiveTestAndSetOwnershipOfCriticalSection (in category 'process primitives') -----
+ primitiveTestAndSetOwnershipOfCriticalSection
+ "Attempt to test-and-set the ownership of the critical section. If not owned,
+ set the owner to the current process and answer false. If owned by the
+ current process answer true. If owned by some other process answer nil.
+ For simulation if there is an argument it is taken to be the effective activeProcess
+ (see Process>>effectiveProcess)."
+ | criticalSection owningProcessIndex owningProcess activeProc |
+ argumentCount > 0
+ ifTrue:
+ [criticalSection := self stackValue: 1. "rcvr"
+ activeProc := self stackTop]
+ ifFalse:
+ [criticalSection := self stackTop. "rcvr"
+ activeProc := self activeProcess].
+ owningProcessIndex := ExcessSignalsIndex. "CriticalSections are laid out like Semaphores"
+ owningProcess := objectMemory fetchPointer: owningProcessIndex ofObject: criticalSection.
+ owningProcess = objectMemory nilObject ifTrue:
+ [objectMemory storePointer: owningProcessIndex
+ ofObject: criticalSection
+ withValue: activeProc.
+ ^self pop: argumentCount + 1 thenPush: objectMemory falseObject].
+ owningProcess = activeProc ifTrue:
+ [^self pop: argumentCount + 1 thenPush: objectMemory trueObject].
+ self pop: argumentCount + 1 thenPush: objectMemory nilObject!
Item was added:
+ ----- Method: InterpreterPrimitives>>putToSleep:yieldingIf: (in category 'process primitive support') -----
+ putToSleep: aProcess yieldingIf: yieldImplicitly
+ "Save the given process on the scheduler process list for its priority,
+ adding to the back if yieldImplicitly or to the front if not yieldImplicitly."
+
+ self subclassResponsibility
+ !
Item was added:
+ ----- Method: InterpreterPrimitives>>resume:preemptedYieldingIf: (in category 'process primitive support') -----
+ resume: aProcess preemptedYieldingIf: yieldImplicitly
+ "Make aProcess runnable and if its priority is higher than that of the
+ current process, preempt the current process. Answer if the current
+ process was preempted. If the current process was preempted then if
+ yieldImplicitly add the current process to the back of its run queue,
+ causing an implicit yiled to other processes on the run queue, otherwise
+ add the current process to the front of its run queue, hence not yielding.
+ Blue book behaviour is to yield implicitly but is arguably incorrect."
+ | activeProc activePriority newPriority |
+ <inline: false>
+ activeProc := self activeProcess.
+ activePriority := self quickFetchInteger: PriorityIndex ofObject: activeProc.
+ newPriority := self quickFetchInteger: PriorityIndex ofObject: aProcess.
+ newPriority <= activePriority ifTrue:
+ [self putToSleep: aProcess yieldingIf: true.
+ ^false].
+ self putToSleep: activeProc yieldingIf: yieldImplicitly.
+ self transferTo: aProcess.
+ ^true!
Item was added:
+ ----- Method: InterpreterPrimitives>>schedulerPointer (in category 'process primitive support') -----
+ schedulerPointer
+
+ ^ objectMemory fetchPointer: ValueIndex ofObject: (objectMemory splObj: SchedulerAssociation)!
Item was changed:
InterpreterPrimitives subclass: #StackInterpreter
+ instanceVariableNames: 'currentBytecode localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue primitiveFunctionPointer methodCache atCache lkupClass highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassSizeBytes interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered tempOop statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents theUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite statPendingFinalizationSignals classByteArrayCompactIndex messageSelector profileProcess nextProfileTick profileMethod profileSemaphore'
- instanceVariableNames: 'currentBytecode localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue primitiveFunctionPointer methodCache atCache lkupClass highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassSizeBytes interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered tempOop statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents theUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite statPendingFinalizationSignals classByteArrayCompactIndex messageSelector preemptionYields profileProcess nextProfileTick profileMethod profileSemaphore'
classVariableNames: 'AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeTable BytesPerWord COGMTVM COGVM CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition IMMUTABILITY MULTIPLEBYTECODESETS MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MixinIndex NewspeakVM PrimitiveExternalCallIndex PrimitiveTable STACKVM VMBIGENDIAN'
poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSqueakV3BytecodeConstants VMSqueakV3ObjectRepresentationConstants VMStackFrameOffsets'
category: 'VMMaker-Interpreter'!
!StackInterpreter commentStamp: '<historical>' prior: 0!
This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts.
It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms.
The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context.
In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case.
NOTE: Here follows a list of things to be borne in mind when working on this code, or when making changes for the future.
1. There are a number of things that should be done the next time we plan to release a completely incompatible image format. These include unifying the instanceSize field of the class format word -- see instantiateClass:indexableSize:, and unifying the bits of the method primitive index (if we decide we need more than 512, after all) -- see primitiveIndexOf:. Also, contexts should be given a special format code (see next item).
2. There are several fast checks for contexts (see isContextHeader: and isMethodContextHeader:) which will fail if the compact class indices of BlockContext or MethodContext change. This is necessary because the oops may change during a compaction when the oops are being adjusted. It's important to be aware of this when writing a new image using the SystemTracer. A better solution would be to reserve one of the format codes for Contexts only.
3. We have made normal files tolerant to size and positions up to 32 bits. This has not been done for async files, since they are still experimental. The code in size, at: and at:put: should work with sizes and indices up to 31 bits, although I have not tested it (di 12/98); it might or might not work with 32-bit sizes.
4. Note that 0 is used in a couple of places as an impossible oop. This should be changed to a constant that really is impossible (or perhaps there is code somewhere that guarantees it --if so it should be put in this comment). The places include the method cache and the at cache.
5. Moving to a 2 bit immediate tag and having immediate Characters is a good choice for Unicode and the JIT
6. If Eliot Miranda's 2 word header scheme is acceptable in terms of footprint (we estimate about a 10% increase in image size with about 35 reclaimed by better representation of CompiledMethod - loss of MethodProperties) then the in-line cache for the JIT is simplified, class access is faster and header access is the same in 32-bit and full 64-bit images.!
Item was removed:
- ----- Method: StackInterpreter>>activeProcess (in category 'process primitive support') -----
- activeProcess
- "Answer the current activeProcess."
- <api> "useful for VM debugging"
- ^objectMemory fetchPointer: ActiveProcessIndex ofObject: self schedulerPointer!
Item was removed:
- ----- Method: StackInterpreter>>addFirstLink:toList: (in category 'process primitive support') -----
- addFirstLink: proc toList: aList
- "Add the given process to the front of the given linked list
- and set the backpointer of process to its new list."
- | firstLink |
- self assert: (objectMemory fetchPointer: NextLinkIndex ofObject: proc) = objectMemory nilObject.
- firstLink := objectMemory fetchPointer: FirstLinkIndex ofObject: aList.
- self assert: firstLink ~= proc.
- objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: proc.
- firstLink = objectMemory nilObject "a.k.a. (self isEmptyList: aList)"
- ifTrue: [objectMemory storePointer: LastLinkIndex ofObject: aList withValue: proc]
- ifFalse: [objectMemory storePointer: NextLinkIndex ofObject: proc withValue: firstLink].
- objectMemory storePointer: MyListIndex ofObject: proc withValue: aList!
Item was removed:
- ----- Method: StackInterpreter>>addLastLink:toList: (in category 'process primitive support') -----
- addLastLink: proc toList: aList
- "Add the given process to the end of the given linked list
- and set the backpointer of process to its new list."
- | lastLink |
- self assert: (objectMemory fetchPointer: NextLinkIndex ofObject: proc) = objectMemory nilObject.
- (self isEmptyList: aList)
- ifTrue: [objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: proc]
- ifFalse:
- [lastLink := objectMemory fetchPointer: LastLinkIndex ofObject: aList.
- self assert: lastLink ~= proc.
- objectMemory storePointer: NextLinkIndex ofObject: lastLink withValue: proc].
- objectMemory storePointer: LastLinkIndex ofObject: aList withValue: proc.
- objectMemory storePointer: MyListIndex ofObject: proc withValue: aList!
Item was removed:
- ----- Method: StackInterpreter>>resume:preemptedYieldingIf: (in category 'process primitive support') -----
- resume: aProcess preemptedYieldingIf: yieldImplicitly
- "Make aProcess runnable and if its priority is higher than that of the
- current process, preempt the current process. Answer if the current
- process was preempted. If the current process was preempted then if
- yieldImplicitly add the current process to the back of its run queue,
- causing an implicit yiled to other processes on the run queue, otherwise
- add the current process to the front of its run queue, hence not yielding.
- Blue book behaviour is to yield implicitly but is arguably incorrect."
- | activeProc activePriority newPriority |
- <inline: false>
- activeProc := self activeProcess.
- activePriority := self quickFetchInteger: PriorityIndex ofObject: activeProc.
- newPriority := self quickFetchInteger: PriorityIndex ofObject: aProcess.
- newPriority <= activePriority ifTrue:
- [self putToSleep: aProcess yieldingIf: true.
- ^false].
- self putToSleep: activeProc yieldingIf: yieldImplicitly.
- self transferTo: aProcess.
- ^true!
Item was removed:
- ----- Method: StackInterpreter>>schedulerPointer (in category 'process primitive support') -----
- schedulerPointer
-
- ^ objectMemory fetchPointer: ValueIndex ofObject: (objectMemory splObj: SchedulerAssociation)!
Item was removed:
- ----- Method: StackInterpreterPrimitives>>primitiveEnterCriticalSection (in category 'process primitives') -----
- primitiveEnterCriticalSection
- "Attempt to enter a CriticalSection/Mutex. If not owned, set the owner to the current
- process and answer false. If owned by the current process answer true. Otherwise
- suspend the process. Answer if the receiver is owned by the current process.
- For simulation if there is an argument it is taken to be the effective activeProcess
- (see Process>>effectiveProcess)."
- | criticalSection owningProcessIndex owningProcess activeProc |
- argumentCount > 0
- ifTrue:
- [criticalSection := self stackValue: 1. "rcvr"
- activeProc := self stackTop]
- ifFalse:
- [criticalSection := self stackTop. "rcvr"
- activeProc := self activeProcess].
- owningProcessIndex := ExcessSignalsIndex. "CriticalSections are laid out like Semaphores"
- owningProcess := objectMemory fetchPointer: owningProcessIndex ofObject: criticalSection.
- owningProcess = objectMemory nilObject ifTrue:
- [objectMemory storePointer: owningProcessIndex
- ofObject: criticalSection
- withValue: activeProc.
- ^self pop: argumentCount + 1 thenPush: objectMemory falseObject].
- owningProcess = activeProc ifTrue:
- [^self pop: argumentCount + 1 thenPush: objectMemory trueObject].
- "Arrange to answer false (unowned) when the process is resumed."
- self pop: argumentCount + 1 thenPush: objectMemory falseObject.
- self addLastLink: activeProc toList: criticalSection.
- self transferTo: self wakeHighestPriority!
Item was removed:
- ----- Method: StackInterpreterPrimitives>>primitiveExitCriticalSection (in category 'process primitives') -----
- primitiveExitCriticalSection
- "Exit the critical section.
- This may change the active process as a result."
- | criticalSection owningProcessIndex owningProcess |
- criticalSection := self stackTop. "rcvr"
- owningProcessIndex := ExcessSignalsIndex. "CriticalSections are laid out like Semaphores"
- (self isEmptyList: criticalSection)
- ifTrue:
- [objectMemory storePointerUnchecked: owningProcessIndex
- ofObject: criticalSection
- withValue: objectMemory nilObject]
- ifFalse:
- [owningProcess := self removeFirstLinkOfList: criticalSection.
- "store check unnecessary because criticalSection referred to owningProcess
- via its FirstLinkIndex slot before owningProcess was removed."
- objectMemory storePointerUnchecked: owningProcessIndex
- ofObject: criticalSection
- withValue: owningProcess.
- "Note that resume: isn't fair; it won't suspend the active process.
- For fairness we must do the equivalent of a primitiveYield, but that
- may break old code, so we stick with unfair resume:."
- self resume: owningProcess preemptedYieldingIf: preemptionYields]!
Item was removed:
- ----- Method: StackInterpreterPrimitives>>primitiveTestAndSetOwnershipOfCriticalSection (in category 'process primitives') -----
- primitiveTestAndSetOwnershipOfCriticalSection
- "Attempt to test-and-set the ownership of the critical section. If not owned,
- set the owner to the current process and answer false. If owned by the
- current process answer true. If owned by some other process answer nil.
- For simulation if there is an argument it is taken to be the effective activeProcess
- (see Process>>effectiveProcess)."
- | criticalSection owningProcessIndex owningProcess activeProc |
- argumentCount > 0
- ifTrue:
- [criticalSection := self stackValue: 1. "rcvr"
- activeProc := self stackTop]
- ifFalse:
- [criticalSection := self stackTop. "rcvr"
- activeProc := self activeProcess].
- owningProcessIndex := ExcessSignalsIndex. "CriticalSections are laid out like Semaphores"
- owningProcess := objectMemory fetchPointer: owningProcessIndex ofObject: criticalSection.
- owningProcess = objectMemory nilObject ifTrue:
- [objectMemory storePointer: owningProcessIndex
- ofObject: criticalSection
- withValue: activeProc.
- ^self pop: argumentCount + 1 thenPush: objectMemory falseObject].
- owningProcess = activeProc ifTrue:
- [^self pop: argumentCount + 1 thenPush: objectMemory trueObject].
- self pop: argumentCount + 1 thenPush: objectMemory nilObject!
Item was changed:
----- Method: VMMaker class>>versionString (in category 'version testing') -----
versionString
"VMMaker versionString"
+ ^'4.15.2'!
- ^'4.15.1'!
1
0
23 Jan '16
Revision: 3567
Author: lewis
Date: 2016-01-23 11:24:12 -0800 (Sat, 23 Jan 2016)
Log Message:
-----------
Update per VMMaker 4.15.1 (VMMaker-dtl.374)
As of Kernel-eem.971 in the Squeak trunk update stream, primitiveSignalAtUTCMicroseconds
is a required primitive. Provide an implementation for the context interpreter. Tick resolution
continues to be 1 msec (not microsecond precision).
Refoctoring note: The microsecond primitives are currently implemented separately in
the context interpreter and stack interpreter. Future refactoring could move these to
InterpreterPrimitives, such that the oriiginal millisecond tick resolution would be replaced.
Modified Paths:
--------------
trunk/src/ckformat.c
trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
trunk/src/plugins/AioPlugin/AioPlugin.c
trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
trunk/src/plugins/B2DPlugin/B2DPlugin.c
trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
trunk/src/plugins/CameraPlugin/CameraPlugin.c
trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
trunk/src/plugins/DBusPlugin/DBusPlugin.c
trunk/src/plugins/DESPlugin/DESPlugin.c
trunk/src/plugins/DSAPrims/DSAPrims.c
trunk/src/plugins/DropPlugin/DropPlugin.c
trunk/src/plugins/FFTPlugin/FFTPlugin.c
trunk/src/plugins/FT2Plugin/FT2Plugin.c
trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
trunk/src/plugins/FilePlugin/FilePlugin.c
trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c
trunk/src/plugins/GeniePlugin/GeniePlugin.c
trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c
trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c
trunk/src/plugins/Klatt/Klatt.c
trunk/src/plugins/LargeIntegers/LargeIntegers.c
trunk/src/plugins/LocalePlugin/LocalePlugin.c
trunk/src/plugins/MD5Plugin/MD5Plugin.c
trunk/src/plugins/MIDIPlugin/MIDIPlugin.c
trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
trunk/src/plugins/RePlugin/RePlugin.c
trunk/src/plugins/RomePlugin/RomePlugin.c
trunk/src/plugins/SHA256Plugin/SHA256Plugin.c
trunk/src/plugins/ScratchPlugin/ScratchPlugin.c
trunk/src/plugins/SecurityPlugin/SecurityPlugin.c
trunk/src/plugins/SerialPlugin/SerialPlugin.c
trunk/src/plugins/SocketPlugin/SocketPlugin.c
trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c
trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
trunk/src/plugins/SoundPlugin/SoundPlugin.c
trunk/src/plugins/Squeak3D/Squeak3D.c
trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
trunk/src/plugins/SqueakSSL/SqueakSSL.c
trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c
trunk/src/plugins/UUIDPlugin/UUIDPlugin.c
trunk/src/plugins/UnicodePlugin/UnicodePlugin.c
trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
trunk/src/plugins/WeDoPlugin/WeDoPlugin.c
trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c
trunk/src/plugins/ZipPlugin/ZipPlugin.c
trunk/src/vm/interp.c
trunk/src/vm/interp.h
trunk/src/vm/sqNamedPrims.h
Modified: trunk/src/ckformat.c
===================================================================
--- trunk/src/ckformat.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/ckformat.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -5,7 +5,7 @@
/* Usage: ckformat imageFileName */
/* --- DO NOT EDIT THIS FILE --- */
-/* --- Automatically generated from class ImageFormat 2015-12-10T21:47:25.47+01:00--- */
+/* --- Automatically generated from class ImageFormat 2016-01-23T14:15:38.093+01:00--- */
/* --- Source code is in package ImageFormat in the VMMaker repository --- */
/* --- DO NOT EDIT THIS FILE --- */
Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
===================================================================
--- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:14 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:15 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- ADPCMCodecPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ ADPCMCodecPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "ADPCMCodecPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -70,9 +70,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ADPCMCodecPlugin 10 December 2015 (i)"
+ "ADPCMCodecPlugin 23 January 2016 (i)"
#else
- "ADPCMCodecPlugin 10 December 2015 (e)"
+ "ADPCMCodecPlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/AioPlugin/AioPlugin.c
===================================================================
--- trunk/src/plugins/AioPlugin/AioPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/AioPlugin/AioPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:24 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:36 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
UnixAioPlugin * uuid: nil
*/
@@ -86,9 +86,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AioPlugin 10 December 2015 (i)"
+ "AioPlugin 23 January 2016 (i)"
#else
- "AioPlugin 10 December 2015 (e)"
+ "AioPlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:14 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:15 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- AsynchFilePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ AsynchFilePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "AsynchFilePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -67,9 +67,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AsynchFilePlugin 10 December 2015 (i)"
+ "AsynchFilePlugin 23 January 2016 (i)"
#else
- "AsynchFilePlugin 10 December 2015 (e)"
+ "AsynchFilePlugin 23 January 2016 (e)"
#endif
;
static void * sCOAFfn;
Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:16 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:19 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- BalloonEnginePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ BalloonEnginePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "BalloonEnginePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -447,9 +447,9 @@
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin 10 December 2015 (i)"
+ "B2DPlugin 23 January 2016 (i)"
#else
- "B2DPlugin 10 December 2015 (e)"
+ "B2DPlugin 23 January 2016 (e)"
#endif
;
static int* objBuffer;
Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
===================================================================
--- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:20 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:28 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- B3DAcceleratorPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ B3DAcceleratorPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "B3DAcceleratorPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -107,9 +107,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B3DAcceleratorPlugin 10 December 2015 (i)"
+ "B3DAcceleratorPlugin 23 January 2016 (i)"
#else
- "B3DAcceleratorPlugin 10 December 2015 (e)"
+ "B3DAcceleratorPlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:14 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:15 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- BMPReadWriterPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ BMPReadWriterPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "BMPReadWriterPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -58,9 +58,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BMPReadWriterPlugin 10 December 2015 (i)"
+ "BMPReadWriterPlugin 23 January 2016 (i)"
#else
- "BMPReadWriterPlugin 10 December 2015 (e)"
+ "BMPReadWriterPlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:17 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:20 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- BitBltSimulation * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ BitBltSimulation VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "BitBltSimulation * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -256,9 +256,9 @@
};
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BitBltPlugin 10 December 2015 (i)"
+ "BitBltPlugin 23 January 2016 (i)"
#else
- "BitBltPlugin 10 December 2015 (e)"
+ "BitBltPlugin 23 January 2016 (e)"
#endif
;
static sqInt nWords;
Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c
===================================================================
--- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:21 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:29 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- CameraPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ CameraPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "CameraPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "CameraPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -64,9 +64,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "CameraPlugin 10 December 2015 (i)"
+ "CameraPlugin 23 January 2016 (i)"
#else
- "CameraPlugin 10 December 2015 (e)"
+ "CameraPlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
===================================================================
--- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:21 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:29 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- ClipboardExtendedPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ ClipboardExtendedPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "ClipboardExtendedPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -61,9 +61,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ClipboardExtendedPlugin 10 December 2015 (i)"
+ "ClipboardExtendedPlugin 23 January 2016 (i)"
#else
- "ClipboardExtendedPlugin 10 December 2015 (e)"
+ "ClipboardExtendedPlugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
===================================================================
--- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:17 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:21 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- CroquetPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ CroquetPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "CroquetPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -73,9 +73,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "CroquetPlugin 10 December 2015 (i)"
+ "CroquetPlugin 23 January 2016 (i)"
#else
- "CroquetPlugin 10 December 2015 (e)"
+ "CroquetPlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c
===================================================================
--- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:21 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:29 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665
*/
@@ -143,9 +143,9 @@
static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH];
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DBusPlugin 10 December 2015 (i)"
+ "DBusPlugin 23 January 2016 (i)"
#else
- "DBusPlugin 10 December 2015 (e)"
+ "DBusPlugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/DESPlugin/DESPlugin.c
===================================================================
--- trunk/src/plugins/DESPlugin/DESPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/DESPlugin/DESPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:17 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:21 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
DESPlugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465
*/
@@ -69,9 +69,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DESPlugin 10 December 2015 (i)"
+ "DESPlugin 23 January 2016 (i)"
#else
- "DESPlugin 10 December 2015 (e)"
+ "DESPlugin 23 January 2016 (e)"
#endif
;
static unsigned char pc1[56] = {
Modified: trunk/src/plugins/DSAPrims/DSAPrims.c
===================================================================
--- trunk/src/plugins/DSAPrims/DSAPrims.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/DSAPrims/DSAPrims.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:17 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:21 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
DSAPlugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465
*/
@@ -67,9 +67,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DSAPrims 10 December 2015 (i)"
+ "DSAPrims 23 January 2016 (i)"
#else
- "DSAPrims 10 December 2015 (e)"
+ "DSAPrims 23 January 2016 (e)"
#endif
;
static sqInt remainderDigitCount;
Modified: trunk/src/plugins/DropPlugin/DropPlugin.c
===================================================================
--- trunk/src/plugins/DropPlugin/DropPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/DropPlugin/DropPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:17 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- DropPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ DropPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "DropPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -62,9 +62,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DropPlugin 10 December 2015 (i)"
+ "DropPlugin 23 January 2016 (i)"
#else
- "DropPlugin 10 December 2015 (e)"
+ "DropPlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c
===================================================================
--- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:17 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- FFTPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ FFTPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "FFTPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "FFTPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -68,9 +68,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FFTPlugin 10 December 2015 (i)"
+ "FFTPlugin 23 January 2016 (i)"
#else
- "FFTPlugin 10 December 2015 (e)"
+ "FFTPlugin 23 January 2016 (e)"
#endif
;
static sqInt nu;
Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c
===================================================================
--- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,4 +1,4 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:22 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:30 pm */
/* Automatically generated by
FT2PluginCodeGenerator * FreeType-nice.443 uuid: d8120335-a67f-4a64-94ea-90145046f7dc
from
@@ -121,9 +121,9 @@
static FT_Library library;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FT2Plugin 10 December 2015 (i)"
+ "FT2Plugin 23 January 2016 (i)"
#else
- "FT2Plugin 10 December 2015 (e)"
+ "FT2Plugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
===================================================================
--- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:22 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:31 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- FileCopyPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ FileCopyPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "FileCopyPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -57,9 +57,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FileCopyPlugin 10 December 2015 (i)"
+ "FileCopyPlugin 23 January 2016 (i)"
#else
- "FileCopyPlugin 10 December 2015 (e)"
+ "FileCopyPlugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/FilePlugin/FilePlugin.c
===================================================================
--- trunk/src/plugins/FilePlugin/FilePlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/FilePlugin/FilePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:18 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- FilePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ FilePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "FilePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -100,9 +100,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FilePlugin 10 December 2015 (i)"
+ "FilePlugin 23 January 2016 (i)"
#else
- "FilePlugin 10 December 2015 (e)"
+ "FilePlugin 23 January 2016 (e)"
#endif
;
static void * sCCPfn;
Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
===================================================================
--- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:18 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- FloatArrayPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ FloatArrayPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "FloatArrayPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -72,9 +72,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatArrayPlugin 10 December 2015 (i)"
+ "FloatArrayPlugin 23 January 2016 (i)"
#else
- "FloatArrayPlugin 10 December 2015 (e)"
+ "FloatArrayPlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c
===================================================================
--- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:18 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:22 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- FloatMathPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ FloatMathPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "FloatMathPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -79,9 +79,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatMathPlugin 10 December 2015 (i)"
+ "FloatMathPlugin 23 January 2016 (i)"
#else
- "FloatMathPlugin 10 December 2015 (e)"
+ "FloatMathPlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c
===================================================================
--- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:18 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:23 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- GeniePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ GeniePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "GeniePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "GeniePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -61,9 +61,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "GeniePlugin v2.0 10 December 2015 (i)"
+ "GeniePlugin v2.0 23 January 2016 (i)"
#else
- "GeniePlugin v2.0 10 December 2015 (e)"
+ "GeniePlugin v2.0 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c
===================================================================
--- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:22 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:32 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- HostWindowPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ HostWindowPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "HostWindowPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -66,9 +66,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "HostWindowPlugin 10 December 2015 (i)"
+ "HostWindowPlugin 23 January 2016 (i)"
#else
- "HostWindowPlugin 10 December 2015 (e)"
+ "HostWindowPlugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
===================================================================
--- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:18 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:23 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- JPEGReadWriter2Plugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ JPEGReadWriter2Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "JPEGReadWriter2Plugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -68,9 +68,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReadWriter2Plugin 10 December 2015 (i)"
+ "JPEGReadWriter2Plugin 23 January 2016 (i)"
#else
- "JPEGReadWriter2Plugin 10 December 2015 (e)"
+ "JPEGReadWriter2Plugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
===================================================================
--- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:18 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:23 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- JPEGReaderPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ JPEGReaderPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "JPEGReaderPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -136,9 +136,9 @@
static sqInt jsReadLimit;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReaderPlugin 10 December 2015 (i)"
+ "JPEGReaderPlugin 23 January 2016 (i)"
#else
- "JPEGReaderPlugin 10 December 2015 (e)"
+ "JPEGReaderPlugin 23 January 2016 (e)"
#endif
;
static int *residuals;
Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
===================================================================
--- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:18 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:23 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- JoystickTabletPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ JoystickTabletPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "JoystickTabletPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -62,9 +62,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JoystickTabletPlugin 10 December 2015 (i)"
+ "JoystickTabletPlugin 23 January 2016 (i)"
#else
- "JoystickTabletPlugin 10 December 2015 (e)"
+ "JoystickTabletPlugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c
===================================================================
--- trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:23 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:33 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
KedamaPlugin2 Kedama-Plugins-yo.1 uuid: 3fc7d691-0149-ba4d-a339-5d27cd44a2f8
*/
@@ -123,9 +123,9 @@
static unsigned int kedamaRandomSeed;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "KedamaPlugin2 10 December 2015 (i)"
+ "KedamaPlugin2 23 January 2016 (i)"
#else
- "KedamaPlugin2 10 December 2015 (e)"
+ "KedamaPlugin2 23 January 2016 (e)"
#endif
;
static unsigned int randA;
Modified: trunk/src/plugins/Klatt/Klatt.c
===================================================================
--- trunk/src/plugins/Klatt/Klatt.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/Klatt/Klatt.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:18 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:24 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- KlattSynthesizerPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ KlattSynthesizerPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "KlattSynthesizerPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -155,9 +155,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Klatt 10 December 2015 (i)"
+ "Klatt 23 January 2016 (i)"
#else
- "Klatt 10 December 2015 (e)"
+ "Klatt 23 January 2016 (e)"
#endif
;
static float nlast;
Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:19 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:24 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- LargeIntegersPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ LargeIntegersPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "LargeIntegersPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c
===================================================================
--- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:19 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:25 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- LocalePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ LocalePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "LocalePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "LocalePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -71,9 +71,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "LocalePlugin 10 December 2015 (i)"
+ "LocalePlugin 23 January 2016 (i)"
#else
- "LocalePlugin 10 December 2015 (e)"
+ "LocalePlugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/MD5Plugin/MD5Plugin.c
===================================================================
--- trunk/src/plugins/MD5Plugin/MD5Plugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/MD5Plugin/MD5Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:19 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:25 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
MD5Plugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465
*/
@@ -61,9 +61,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MD5Plugin 10 December 2015 (i)"
+ "MD5Plugin 23 January 2016 (i)"
#else
- "MD5Plugin 10 December 2015 (e)"
+ "MD5Plugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c
===================================================================
--- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:23 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:33 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- MIDIPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ MIDIPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "MIDIPlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -70,9 +70,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MIDIPlugin 10 December 2015 (i)"
+ "MIDIPlugin 23 January 2016 (i)"
#else
- "MIDIPlugin 10 December 2015 (e)"
+ "MIDIPlugin 23 January 2016 (e)"
#endif
;
static sqInt simulator;
Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
===================================================================
--- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:19 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:25 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- Matrix2x3Plugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ Matrix2x3Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "Matrix2x3Plugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -74,9 +74,9 @@
static double m23ResultY;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Matrix2x3Plugin 10 December 2015 (i)"
+ "Matrix2x3Plugin 23 January 2016 (i)"
#else
- "Matrix2x3Plugin 10 December 2015 (e)"
+ "Matrix2x3Plugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
===================================================================
--- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:19 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:25 pm */
/* Automatically generated by
- VMPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ VMPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- MiscPrimitivePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ MiscPrimitivePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "MiscPrimitivePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -70,9 +70,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MiscPrimitivePlugin 10 December 2015 (i)"
+ "MiscPrimitivePlugin 23 January 2016 (i)"
#else
- "MiscPrimitivePlugin 10 December 2015 (e)"
+ "MiscPrimitivePlugin 23 January 2016 (e)"
#endif
;
Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
===================================================================
--- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:23 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:34 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- Mpeg3Plugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ Mpeg3Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "Mpeg3Plugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "Mpeg3Plugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -101,9 +101,9 @@
static sqInt maximumNumberOfFilesToWatch;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Mpeg3Plugin 10 December 2015 (i)"
+ "Mpeg3Plugin 23 January 2016 (i)"
#else
- "Mpeg3Plugin 10 December 2015 (e)"
+ "Mpeg3Plugin 23 January 2016 (e)"
#endif
;
static mpeg3_t *mpegFiles[1024+1];
Modified: trunk/src/plugins/RePlugin/RePlugin.c
===================================================================
--- trunk/src/plugins/RePlugin/RePlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/RePlugin/RePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:19 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:26 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
- RePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ RePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
*/
-static char __buildInfo[] = "RePlugin * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc " __DATE__ ;
+static char __buildInfo[] = "RePlugin VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795 " __DATE__ ;
@@ -79,9 +79,9 @@
static sqInt matchFlags;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "RePlugin 10 December 2015 (i)"
+ "RePlugin 23 January 2016 (i)"
#else
- "RePlugin 10 December 2015 (e)"
+ "RePlugin 23 January 2016 (e)"
#endif
;
static int netMemory = 0;
Modified: trunk/src/plugins/RomePlugin/RomePlugin.c
===================================================================
--- trunk/src/plugins/RomePlugin/RomePlugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/RomePlugin/RomePlugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:24 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:35 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
RomePlugin Rome-Plugin-dtl.40 uuid: fc8fcc8b-edca-42ec-90db-24190e3e33fd
*/
@@ -199,9 +199,9 @@
static sqInt maxSurfaceID;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "RomePlugin dtl.40 10 December 2015 (i)"
+ "RomePlugin dtl.40 23 January 2016 (i)"
#else
- "RomePlugin dtl.40 10 December 2015 (e)"
+ "RomePlugin dtl.40 23 January 2016 (e)"
#endif
;
static fn_ioRegisterSurface registerSurfaceFn;
Modified: trunk/src/plugins/SHA256Plugin/SHA256Plugin.c
===================================================================
--- trunk/src/plugins/SHA256Plugin/SHA256Plugin.c 2016-01-23 01:47:33 UTC (rev 3566)
+++ trunk/src/plugins/SHA256Plugin/SHA256Plugin.c 2016-01-23 19:24:12 UTC (rev 3567)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.5 with VMMaker 4.14.3 translated as C source on 10 December 2015 9:47:19 pm */
+/* Smalltalk from Squeak4.5 with VMMaker 4.15.1 translated as C source on 23 January 2016 2:15:26 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator * VMMaker-tpr.372 uuid: 4cb83acc-cffe-4e94-b3c5-2ba5d69bcffc
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.374 uuid: ec1dc8c8-f83d-45a8-b28b-929bd5296795
from
SHA256Plugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465
*/
@@ -65,9 +65,9 @@
@@ Diff output truncated at 50000 characters. @@
1
0
David T. Lewis uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker-dtl.374.mcz
==================== Summary ====================
Name: VMMaker-dtl.374
Author: dtl
Time: 23 January 2016, 2:13:16.858 pm
UUID: ec1dc8c8-f83d-45a8-b28b-929bd5296795
Ancestors: VMMaker-dtl.373
VMMaker 4.15.1
As of Kernel-eem.971 in the Squeak trunk update stream, primitiveSignalAtUTCMicroseconds
is a required primitive. Provide an implementation for the context interpreter. Tick resolution
continues to be 1 msec (not microsecond precision).
Refoctoring note: The microsecond primitives are currently implemented separately in
the context interpreter and stack interpreter. Future refactoring could move these to
InterpreterPrimitives, such that the oriiginal millisecond tick resolution would be replaced.
=============== Diff against VMMaker-dtl.373 ===============
Item was changed:
----- Method: Interpreter class>>initializePrimitiveTable (in category 'initialization') -----
(excessive size, no diff calculated)
Item was added:
+ ----- Method: Interpreter>>primitiveSignalAtUTCMicroseconds (in category 'system control primitives') -----
+ primitiveSignalAtUTCMicroseconds
+ "Cause the time semaphore, if one has been registered, to be
+ signalled when the microsecond clock is greater than or equal to
+ the given tick value. A tick value of zero turns off timer interrupts."
+
+ "Provided for compatibility with StackInterpreter microsecond implementation.
+ This is a required primitive in some newer images, and is implemented here
+ with millisecond precision only."
+
+ | tick sema usecsObj now usecs |
+ <var: #usecs type: #usqLong>
+ <var: #now type: #usqLong>
+ usecsObj := self popStack.
+ sema := self popStack.
+ usecs := self positive64BitValueOf: usecsObj.
+ now := self ioUTCMicroseconds.
+ tick := lastTick + (self cCoerce: usecs - now + 500 / 1000 to: #sqInt). "add 500 for rounding"
+ self successful
+ ifTrue: [(objectMemory fetchClassOf: sema) = (objectMemory splObj: ClassSemaphore)
+ ifTrue: [objectMemory
+ storePointer: TheTimerSemaphore
+ ofObject: objectMemory getSpecialObjectsOop
+ withValue: sema.
+ nextWakeupTick := tick]
+ ifFalse: [objectMemory
+ storePointer: TheTimerSemaphore
+ ofObject: objectMemory getSpecialObjectsOop
+ withValue: objectMemory getNilObj.
+ nextWakeupTick := 0]]
+ ifFalse: [self unPop: 2]!
Item was changed:
----- Method: InterpreterPrimitives>>ioUTCMicroseconds (in category 'FIXME') -----
ioUTCMicroseconds
"Answer the UTC microseconds since the Smalltalk epoch. The value is
derived from the Posix epoch (see primitiveUTCMicrosecondClock) with a
constant offset corresponding to elapsed microseconds between the two
epochs according to RFC 868."
"Added to Cross/vm/sqVirtualMachine but incompatible with existing timer
support in Cross. Implemented here to provide the function not present in
the support code. See also primitiveUTCMicrosecondClock."
+ | clock offset epochDelta |
- | clock offset epochDelta uSecs |
<export: true>
<returnTypeC: 'usqLong'>
<var: #clock type: 'sqLong'>
<var: #offset type: 'int'>
<var: #epochDelta declareC: 'static usqLong epochDelta= 2177452800000000ULL'>
self flag: #FIXME. "remove this method when platform sources are reconciled"
(self cCode: 'ioUtcWithOffset(&clock, &offset)' inSmalltalk: [-1]) = -1
ifTrue: [^ self primitiveFail].
+ ^clock + epochDelta.
- clock := clock + epochDelta.
- uSecs := self positive64BitIntegerFor: clock.
- ^uSecs.
!
Item was added:
+ ----- Method: ObjectMemory>>splObj:put: (in category 'interpreter access') -----
+ splObj: index put: anObject
+ "Set one of the objects in the SpecialObjectsArray"
+ self storePointer: index ofObject: specialObjectsOop withValue: anObject!
Item was changed:
----- Method: StackInterpreter class>>additionalHeadersDo: (in category 'translation') -----
additionalHeadersDo: aBinaryBlock
"Evaluate aBinaryBlock with the names and contents of
any additional header files that need to be generated."
self objectMemoryClass additionalHeadersDo: aBinaryBlock.
+ "aBinaryBlock
- aBinaryBlock
value: 'vmCallback.h'
+ value: self vmCallbackHeader"!
- value: self vmCallbackHeader!
Item was changed:
----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') -----
declareCVarsIn: aCCodeGenerator
self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses"
aCCodeGenerator
addHeaderFile:'<stddef.h> /* for e.g. alloca */';
+ addHeaderFile:'<setjmp.h>'.
- addHeaderFile:'<setjmp.h>';
- addHeaderFile:'"vmCallback.h"';
- addHeaderFile:'"sqMemoryFence.h"';
- addHeaderFile:'"dispdbg.h"'.
self declareInterpreterVersionIn: aCCodeGenerator
defaultName: 'Stack'.
aCCodeGenerator
var: #interpreterProxy type: #'struct VirtualMachine*'.
aCCodeGenerator
declareVar: #sendTrace type: 'volatile int';
declareVar: #byteCount type: 'unsigned long'.
"These need to be pointers or unsigned."
self declareC: #(instructionPointer method newMethod)
as: #usqInt
in: aCCodeGenerator.
"These are all pointers; char * because Slang has no support for C pointer arithmetic."
self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory)
as: #'char *'
in: aCCodeGenerator.
self declareC: #(stackPage overflowedPage)
as: #'StackPage *'
in: aCCodeGenerator.
aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code."
aCCodeGenerator
var: #methodCache
declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'.
aCCodeGenerator
var: #atCache
declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'.
aCCodeGenerator
var: #primitiveTable
declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex +2) printString, ' */])(void) = ', self primitiveTableString.
self primitiveTable do:
[:symbolOrNot|
(symbolOrNot isSymbol
and: [symbolOrNot ~~ #primitiveFail]) ifTrue:
[(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil:
[:tMethod| tMethod returnType: #void]]].
aCCodeGenerator
var: #primitiveFunctionPointer
declareC: 'void (*primitiveFunctionPointer)()'.
aCCodeGenerator
var: #externalPrimitiveTable
declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'.
aCCodeGenerator var: #showSurfaceFn type: #'void *'.
aCCodeGenerator
var: #jmpBuf
declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'.
aCCodeGenerator
var: #suspendedCallbacks
declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'.
aCCodeGenerator
var: #suspendedMethods
declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'.
aCCodeGenerator
var: #interruptCheckChain
declareC: 'void (*interruptCheckChain)(void) = 0'.
aCCodeGenerator
var: #breakSelector type: #'char *';
var: #breakSelectorLength
declareC: 'sqInt breakSelectorLength = -1'.
self declareC: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs
longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs)
as: #usqLong
in: aCCodeGenerator.
aCCodeGenerator var: #nextProfileTick type: #sqLong!
Item was changed:
----- Method: VMMaker class>>versionString (in category 'version testing') -----
versionString
"VMMaker versionString"
+ ^'4.15.1'!
- ^'4.14.3'!
1
0
Re: [Pharo-project] [Vm-dev] Re: Can OSProcess functionality be implemented using FFI instead of plugin?
by Mariano Martinez Peck 23 Jan '16
by Mariano Martinez Peck 23 Jan '16
23 Jan '16
Hi all,
Sorry for reviving an old thread but I thought it was better to continue
the discussion here because of the context.
As you may have read, the other day I released a first approeach to a
subset of OSProcess based on FFI (posix_spwan() family of functions):
https://github.com/marianopeck/OSSubprocess
And with that in mind, I wanted to share a few things with you. The main 2
problems I found with implementing this with FFI was:
1) We have all already agree and discussed that fork+exec cannot be done in
separate FFI calls. So at the very min you need either a plugin method that
does the fork()+exec() OR wrapping a lib like posix_spwan()
2) The other main problem, is, as you all said (and mostly Nicolas), is
the problems with the preprocessor (constants, macros, etc).
With all that said, I was able to get my stuff working. However, I am still
using some primitives of OSProcess plugin because of 2).
I read Eliot idea and what I don't like is the need of a C compiler in the
user machine. I think that's a high constrain. Then Igor suggested that WE
(developers and maintainers of a certain tool) are the ones that compiles
the little C program to extract constant values etc and then WE provide as
part of our source code, some packages with some SharedPool depending on
the platform/OS. And Igor approach looked a bit better to me.
Then Nicolas made a point that if we plan to manage all that complexity at
the image level it may become a hell too.
So.... what if we take a simpler (probably not better) approach and we
consider the "c program that exports constants and sizes" a VM Plugin?
Let's say we have a UnixPreprocessorPlugin (that would work for OSX, Linux
and other's Unix I imagine for the time being) which provides a function
(that is exported) which answers an array of arrays. For each constant, we
include the name of the constant, the value, and the sizeof(). Then from
image side, we simply do one FFI call, we get the large array and we adapt
it to a SharedPool or whatever kind of object representing that info.
I know that different users will need different constants. But let's say
the infrastructure (plugin etc) is already done. And let's say I am a user
that I want to build something with FFI and I need some constants that I
see are not defined. Then I can simply add the ones I need in the plugin,
and next VM release will have those. If Cog gets moved to Github, then this
is even easier. Everybody can do a PR with the constants he needs. And in
fact, if we have the infrastructure in place, I think that we each of us
spend half an hour, we may have almost everything we need.
For example, I can add myself all those for signals (to use kill() from
FFI), all those from fcntl (to make none blocking pipes), all those from
wait()/waitpid() family (so that I can do a waitpid() with WNOHANG), etc
etc etc.
I know it's not the best approach but it's something that could be done
very easily and would allow A LOT of stuff to be moved to FFI just because
we have no access to preprocess constants or sizeof() (to know how to
allocate). I also know this won't cover macros and other stuff. But still.
If you think this is a good idea, I can spend the time to do it.
Cheers,
On Thu, May 10, 2012 at 10:09 AM, Nick Ager <nick.ager(a)gmail.com> wrote:
> <snip>
> Well, like opendbx, maybe because opengl has quite standard interface...
> </snip>
>
> and
>
> <snip>
> It's not that it's not doable, it's that we gonna reinvent gaz plant
> and it gonna be so boring...
> I'd like to see a proof of concept, even if we restrict to libc, libm,
> kernel.dll, msvcrt.dll ...
> </snip>
>
> <snip>
> Is the unix style select()
> ubiquitous or should I use WaitForMultipleObject() on Windows? Are
> specification of read/write streams implementation machine independant
> (bsd/sysv/others...)
> </snip>
>
> Perhaps *a* way forward is to try to find existing projects which have
> already created cross-platform abstractions for platform specific
> functionality. Then we can use FFI to access that interface in a similar
> way to OpenGL and OpenDBX. For example NodeJs works across unixes - perhaps
> they have a useful cross-platform abstraction, boost has abstractions of
> IPC etc
>
> Nick
>
--
Mariano
http://marianopeck.wordpress.com
10
39
23 Jan '16
Revision: 3566
Author: eliot
Date: 2016-01-22 17:47:33 -0800 (Fri, 22 Jan 2016)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1664
Slang: The previous fix surfaced a bug with addTypesFor:to:in: where it would
misstate that a recursive method in the process of being typed could not be
typed because the recursive call was as yet undetermined. The fix is simply to
discount untyped recursive calls, since we're determining precisely that type
and shouldn't abort.
And the type inference algorithm can't cope with mutual recursion, so break the
log jam by explicitly typing findMethodWithPrimitive:FromContext:UpToContext:
which is mutually recursive with findMethodWithPrimitive:FromFP:UpToContext:.
Modified Paths:
--------------
branches/Cog/nsspur64src/vm/cogit.h
branches/Cog/nsspur64src/vm/cogitX64.c
branches/Cog/nsspur64src/vm/cointerp.c
branches/Cog/nsspur64src/vm/cointerp.h
branches/Cog/nsspur64src/vm/gcc3x-cointerp.c
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogitARMv5.c
branches/Cog/nsspursrc/vm/cogitIA32.c
branches/Cog/nsspursrc/vm/cogitMIPSEL.c
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
branches/Cog/nsspurstack64src/vm/interp.c
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/spur64src/vm/cogit.h
branches/Cog/spur64src/vm/cogitX64.c
branches/Cog/spur64src/vm/cointerp.c
branches/Cog/spur64src/vm/cointerp.h
branches/Cog/spur64src/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogitARMv5.c
branches/Cog/spursistasrc/vm/cogitIA32.c
branches/Cog/spursistasrc/vm/cogitMIPSEL.c
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cogitARMv5.c
branches/Cog/spursrc/vm/cogitIA32.c
branches/Cog/spursrc/vm/cogitMIPSEL.c
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spurstack64src/vm/gcc3x-interp.c
branches/Cog/spurstack64src/vm/interp.c
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogitARMv5.c
branches/Cog/src/vm/cogitIA32.c
branches/Cog/src/vm/cogitMIPSEL.c
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspur64src/vm/cogit.h
===================================================================
--- branches/Cog/nsspur64src/vm/cogit.h 2016-01-23 00:34:50 UTC (rev 3565)
+++ branches/Cog/nsspur64src/vm/cogit.h 2016-01-23 01:47:33 UTC (rev 3566)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5
+ CCodeGenerator VMMaker.oscog-eem.1664 uuid: 9e676eea-f638-4da0-bd70-920a096bda28
*/
@@ -25,7 +25,7 @@
extern sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
extern void callCogCodePopReceiver(void);
extern void callCogCodePopReceiverAndClassRegs(void);
-extern void ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver);
+extern sqInt ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver);
extern sqInt ceSICMiss(sqInt receiver);
extern void checkAssertsEnabledInCogit(void);
extern sqInt checkIntegrityOfObjectReferencesInCode(sqInt gcModes);
Modified: branches/Cog/nsspur64src/vm/cogitX64.c
===================================================================
--- branches/Cog/nsspur64src/vm/cogitX64.c 2016-01-23 00:34:50 UTC (rev 3565)
+++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-01-23 01:47:33 UTC (rev 3566)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5
+ CCodeGenerator VMMaker.oscog-eem.1663 uuid: a07a8c3d-4a04-48fc-bed8-f189f0494d6d
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1663 uuid: a07a8c3d-4a04-48fc-bed8-f189f0494d6d
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1663 uuid: a07a8c3d-4a04-48fc-bed8-f189f0494d6d " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -461,7 +461,7 @@
static AbstractInstruction * NoDbgRegParms gCmpRR(sqInt reg1, sqInt reg2);
extern void callCogCodePopReceiver(void);
extern void callCogCodePopReceiverAndClassRegs(void);
-extern void ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver);
+extern sqInt ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver);
extern sqInt ceSICMiss(sqInt receiver);
extern void checkAssertsEnabledInCogit(void);
static sqInt NoDbgRegParms checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod);
@@ -483,7 +483,7 @@
extern CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
extern void compactCogCompiledCode(void);
static AbstractInstruction * compileAbort(void);
-static void NoDbgRegParms compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex);
+static sqInt NoDbgRegParms compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex);
static void NoDbgRegParms compileBlockEntry(BlockStart *blockStart);
static void NoDbgRegParms compileCallFornumArgsargargargargresultRegsaveRegs(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt resultRegOrNone, sqInt saveRegs);
static AbstractInstruction * compileCPICEntry(void);
@@ -3055,7 +3055,7 @@
sp=> sender return address */
/* Cogit>>#ceCPICMiss:receiver: */
-void
+sqInt
ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver)
{
sqInt cacheTag;
@@ -3069,8 +3069,7 @@
sqInt selector;
if (isOopForwarded(receiver)) {
- ceSendFromInLineCacheMiss(cPIC);
- return;
+ return ceSendFromInLineCacheMiss(cPIC);
}
outerReturn = stackTop();
assert(!(((inlineCacheTagAt(backEnd, outerReturn)) == (picAbortDiscriminatorValue()))));
@@ -3133,12 +3132,11 @@
|| (isYoung(newTargetMethodOrNil))))) {
result = patchToOpenPICFornumArgsreceiver((cPIC->selector), (cPIC->cmNumArgs), receiver);
assert(!result);
- ceSendFromInLineCacheMiss(cPIC);
- return;
+ return ceSendFromInLineCacheMiss(cPIC);
}
cogExtendPICCaseNMethodtagisMNUCase(cPIC, newTargetMethodOrNil, cacheTag, errorSelectorOrNil == SelectorDoesNotUnderstand);
executeCogPICfromLinkedSendWithReceiverandCacheTag(cPIC, receiver, inlineCacheTagAt(backEnd, outerReturn));
- return;
+ return null;
}
@@ -4248,7 +4246,7 @@
}
/* Cogit>>#compileBlockDispatchFrom:to: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex)
{
AbstractInstruction *anInstruction;
@@ -4265,7 +4263,7 @@
/* begin Jump: */
jumpTarget = (blockStart->entryLabel);
genoperand(Jump, ((sqInt)jumpTarget));
- return;
+ return null;
}
halfWay = (highBlockStartIndex + lowBlockStartIndex) / 2;
assert(((halfWay >= lowBlockStartIndex) && (halfWay <= highBlockStartIndex)));
@@ -4281,15 +4279,14 @@
jumpTarget1 = (blockStart->entryLabel);
genConditionalBranchoperand(JumpLessOrEqual, ((sqInt)jumpTarget1));
compileBlockDispatchFromto(halfWay + 1, highBlockStartIndex);
- return;
+ return null;
}
if ((halfWay + 1) == highBlockStartIndex) {
blockStart = blockStartAt(highBlockStartIndex);
/* begin JumpGreater: */
jumpTarget2 = (blockStart->entryLabel);
genConditionalBranchoperand(JumpGreater, ((sqInt)jumpTarget2));
- compileBlockDispatchFromto(lowBlockStartIndex, halfWay);
- return;
+ return compileBlockDispatchFromto(lowBlockStartIndex, halfWay);
}
/* begin JumpGreater: */
jmp = genConditionalBranchoperand(JumpGreater, ((sqInt)0));
@@ -5880,12 +5877,12 @@
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
{
unsigned char annotation;
- usqInt delta;
+ sqInt delta;
sqInt i;
AbstractInstruction *instruction;
sqInt length;
- usqInt location;
- usqInt mapEntry;
+ sqInt location;
+ sqInt mapEntry;
sqInt maxDelta;
usqInt mcpc;
Modified: branches/Cog/nsspur64src/vm/cointerp.c
===================================================================
--- branches/Cog/nsspur64src/vm/cointerp.c 2016-01-23 00:34:50 UTC (rev 3565)
+++ branches/Cog/nsspur64src/vm/cointerp.c 2016-01-23 01:47:33 UTC (rev 3566)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1664 uuid: 9e676eea-f638-4da0-bd70-920a096bda28
from
- CoInterpreter VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5
+ CoInterpreter VMMaker.oscog-eem.1664 uuid: 9e676eea-f638-4da0-bd70-920a096bda28
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1664 uuid: 9e676eea-f638-4da0-bd70-920a096bda28 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -479,9 +479,9 @@
extern sqInt ceReturnToInterpreter(sqInt anOop);
extern void ceSelfSendreceiver(sqInt cacheAddress, sqInt methodReceiver);
extern sqInt ceSendAborttonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs);
-extern void ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC);
+extern sqInt ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC);
extern sqInt ceSendMustBeBoolean(sqInt anObject);
-extern void ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs);
+extern sqInt ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs);
extern void ceStackOverflow(sqInt contextSwitchIfNotNil);
extern void ceTraceBlockActivation(void);
extern void ceTraceLinkedSend(sqInt theReceiver);
@@ -527,7 +527,7 @@
extern sqInt getCurrentBytecode(void);
extern char * getFramePointer(void);
static sqInt NoDbgRegParms handleForwardedSendFaultForReceiverstackDelta(sqInt forwardedReceiver, sqInt stackDelta);
-static void NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage);
+static sqInt NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage);
static sqInt NoDbgRegParms iframeIsBlockActivation(char *theFP);
static sqInt NoDbgRegParms iframeReceiver(char *theFP);
static sqInt NoDbgRegParms iframeSavedIP(char *theFP);
@@ -1124,8 +1124,8 @@
static sqInt NoDbgRegParms isValidFreeObject(sqInt objOop);
static sqInt NoDbgRegParms isValidObjStackAt(sqInt objStackRootIndex);
static sqInt NoDbgRegParms isValidObjStackPagemyIndex(sqInt objStackPage, sqInt myx);
-static void NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage);
-static void NoDbgRegParms isValidObjStack(sqInt objStack);
+static sqInt NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage);
+static sqInt NoDbgRegParms isValidObjStack(sqInt objStack);
static sqInt NoDbgRegParms isWeakFormat(sqInt format);
static sqInt NoDbgRegParms isWeakNonImm(sqInt objOop);
extern sqInt isWeak(sqInt oop);
@@ -1343,8 +1343,8 @@
static sqInt NoDbgRegParms findClassContainingMethodstartingAt(sqInt meth, sqInt classObj);
extern sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr);
static char * NoDbgRegParms findFrameAboveinPage(char *theFP, StackPage *thePage);
-static void NoDbgRegParms findHomeForContext(sqInt aContext);
-static void NoDbgRegParms findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext);
+static sqInt NoDbgRegParms findHomeForContext(sqInt aContext);
+static sqInt NoDbgRegParms findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext);
extern sqInt findSelectorOfMethod(sqInt methArg);
static char * NoDbgRegParms findSPOfon(char *theFP, StackPage *thePage);
static sqInt NoDbgRegParms findUnwindThroughContext(sqInt homeContext);
@@ -1399,7 +1399,7 @@
extern sqInt isKindOfClass(sqInt oop, sqInt aClass);
extern sqInt isKindOf(sqInt oop, char *className);
extern sqInt isMemberOf(sqInt oop, char *className);
-static void NoDbgRegParms lengthOfNameOfClass(sqInt classOop);
+static sqInt NoDbgRegParms lengthOfNameOfClass(sqInt classOop);
extern sqInt literalofMethod(sqInt offset, sqInt methodPointer);
extern sqInt loadBitBltFrom(sqInt bb);
extern void loadInitialContext(void);
@@ -1407,7 +1407,7 @@
extern sqInt longStoreBytecodeForHeader(sqInt methodHeader);
static sqInt NoDbgRegParms lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag);
static sqInt NoDbgRegParms lookupLexicalfromrule(sqInt selector, sqInt mixin, sqInt rule);
-static void NoDbgRegParms lookupMethodInClass(sqInt class);
+static sqInt NoDbgRegParms lookupMethodInClass(sqInt class);
static sqInt lookupMNU(void);
static sqInt NoDbgRegParms lookupMNUInClass(sqInt class);
static sqInt NoDbgRegParms lookupOrdinaryNoMNUEtcInClass(sqInt class);
@@ -1453,7 +1453,7 @@
extern void printAllStacks(void);
extern void printCallStack(void);
static sqInt NoDbgRegParms printCallStackFP(char *theFP);
-extern void printCallStackOf(sqInt aContextOrProcessOrFrame);
+extern sqInt printCallStackOf(sqInt aContextOrProcessOrFrame);
static sqInt NoDbgRegParms printCallStackOfcurrentFP(sqInt aContext, char *currFP);
extern void printChar(sqInt aByte);
static sqInt NoDbgRegParms printContextCallStackOf(sqInt aContext);
@@ -1478,7 +1478,7 @@
extern void printOop(sqInt oop);
extern void printProcessStack(sqInt aProcess);
extern sqInt printProcsOnList(sqInt procList);
-extern void printStackCallStackOf(sqInt aContextOrProcessOrFrame);
+extern sqInt printStackCallStackOf(sqInt aContextOrProcessOrFrame);
extern void printStackPageList(void);
extern void printStackPageListInUse(void);
extern void printStackPages(void);
@@ -2436,7 +2436,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1662";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1664";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -18259,7 +18259,7 @@
/* self printStringOf: selector */
/* CoInterpreter>>#ceSendFromInLineCacheMiss: */
-void
+sqInt
ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt classObj;
@@ -18314,13 +18314,11 @@
else {
if (isOopForwarded((cogMethodOrPIC->selector))) {
handleForwardedSelectorFaultFor((cogMethodOrPIC->selector));
- ceSendFromInLineCacheMiss(cogMethodOrPIC);
- return;
+ return ceSendFromInLineCacheMiss(cogMethodOrPIC);
}
if (classTag == (isForwardedObjectClassIndexPun())) {
handleForwardedSendFaultForReceiverstackDelta(rcvr, 1);
- ceSendFromInLineCacheMiss(cogMethodOrPIC);
- return;
+ return ceSendFromInLineCacheMiss(cogMethodOrPIC);
}
GIV(messageSelector) = (cogMethodOrPIC->selector);
/* begin classAtIndex: */
@@ -18353,8 +18351,7 @@
executeNewMethod();
assert(0);
}
- interpretMethodFromMachineCode();
- return;
+ return interpretMethodFromMachineCode();
}
/* CoInterpreter>>#ceSendMustBeBoolean: */
@@ -18397,7 +18394,7 @@
cogged or not. */
/* CoInterpreter>>#ceSend:super:to:numArgs: */
-void
+sqInt
ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt classObj;
@@ -18484,13 +18481,11 @@
else {
if (((selector & (tagMask())) == 0)
&& (((longAt(selector)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
- ceSendsupertonumArgs(handleForwardedSelectorFaultFor(selector), superNormalBar, rcvr, numArgs);
- return;
+ return ceSendsupertonumArgs(handleForwardedSelectorFaultFor(selector), superNormalBar, rcvr, numArgs);
}
if (classTag == (isForwardedObjectClassIndexPun())) {
assert(superNormalBar == 0);
- ceSendsupertonumArgs(selector, superNormalBar, handleForwardedSendFaultForReceiverstackDelta(rcvr, 1), numArgs);
- return;
+ return ceSendsupertonumArgs(selector, superNormalBar, handleForwardedSendFaultForReceiverstackDelta(rcvr, 1), numArgs);
}
GIV(messageSelector) = selector;
/* begin classAtIndex: */
@@ -18562,8 +18557,7 @@
top1 = longAt(GIV(stackPointer));
GIV(stackPointer) += BytesPerWord;
GIV(instructionPointer) = top1;
- interpretMethodFromMachineCode();
- return;
+ return interpretMethodFromMachineCode();
}
@@ -18700,7 +18694,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -20259,7 +20253,7 @@
method. messageSelector is an implicit argument (yuck). */
/* CoInterpreter>>#handleMNU:InMachineCodeTo:classForMessage: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt classForThisMessage;
@@ -20308,8 +20302,7 @@
/* begin push: */
longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer));
GIV(stackPointer) = sp;
- handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForThisMessage);
- return;
+ return handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForThisMessage);
}
}
if (((GIV(newMethod) & (tagMask())) == 0)
@@ -20321,8 +20314,7 @@
executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(GIV(newMethod)), rcvr);
assert(0);
}
- interpretMethodFromMachineCode();
- return;
+ return interpretMethodFromMachineCode();
}
@@ -54153,7 +54145,7 @@
/* Answer if the obj stack at stackRootIndex is valid. */
/* SpurMemoryManager>>#isValidObjStackPage:myIndex:firstPage: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt freeOrNextPage;
@@ -54162,33 +54154,33 @@
sqInt page;
if (!(isValidObjStackPagemyIndex(objStackPage, myx))) {
- return;
+ return 0;
}
freeOrNextPage = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackFreex) << (shiftForWord())));
while (freeOrNextPage != 0) {
if (!isFirstPage) {
GIV(objStackInvalidBecause) = "free page on other than first page";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
if (freeOrNextPage == (longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackNextx) << (shiftForWord()))))) {
GIV(objStackInvalidBecause) = "free page = next page";
GIV(invalidObjStackPage) = freeOrNextPage;
- return;
+ return 0;
}
if (!(isValidObjStackPagemyIndex(freeOrNextPage, myx))) {
ns = malloc(((strlen(GIV(objStackInvalidBecause))) + (strlen(", on next page"))) + 2);
strcpy(ns, GIV(objStackInvalidBecause));
GIV(objStackInvalidBecause) = strcat(ns, ", on next page");
- return;
+ return 0;
}
page = longAt((freeOrNextPage + BaseHeaderSize) + (((long)ObjStackFreex) << (shiftForWord())));
if ((page == freeOrNextPage)
|| (page == objStackPage)) {
GIV(objStackInvalidBecause) = "circularity in free page list";
GIV(invalidObjStackPage) = page;
- return;
+ return 0;
}
freeOrNextPage = page;
}
@@ -54196,48 +54188,46 @@
if (!(((myx >= (1LL << (22 - (classTableMajorIndexShift())))) && (myx <= (((1LL << (22 - (classTableMajorIndexShift()))) + 8) - 1))))) {
GIV(objStackInvalidBecause) = "myx out of range";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
if (!((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)myx) << (shiftForWord())))) == objStackPage)) {
GIV(objStackInvalidBecause) = "firstPage is not root";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
}
index = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackTopx) << (shiftForWord())));
if (!(((index >= 0) && (index <= ObjStackLimit)))) {
GIV(objStackInvalidBecause) = "bad topx";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
freeOrNextPage = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackNextx) << (shiftForWord())));
if (freeOrNextPage == 0) {
- return;
+ return 1;
}
if (freeOrNextPage == objStackPage) {
GIV(objStackInvalidBecause) = "circularity in objStack page list";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
- isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0);
- return;
+ return isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0);
}
/* Answer if the obj stack at objStackRootIndex is valid. */
/* SpurMemoryManager>>#isValidObjStack: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
isValidObjStack(sqInt objStack)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
if (!((addressCouldBeObj(objStack))
&& ((numSlotsOfAny(objStack)) == ObjStackPageSlots))) {
GIV(objStackInvalidBecause) = "first page not obj or wrong size";
GIV(invalidObjStackPage) = objStack;
- return;
+ return 0;
}
- isValidObjStackPagemyIndexfirstPage(objStack, longAt((objStack + BaseHeaderSize) + (((long)ObjStackMyx) << (shiftForWord()))), 1);
- return;
+ return isValidObjStackPagemyIndexfirstPage(objStack, longAt((objStack + BaseHeaderSize) + (((long)ObjStackMyx) << (shiftForWord()))), 1);
}
/* SpurMemoryManager>>#isWeakFormat: */
@@ -67461,7 +67451,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -67803,7 +67793,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- usqInt pier2;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -70844,7 +70834,7 @@
}
/* StackInterpreter>>#findHomeForContext: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
findHomeForContext(sqInt aContext)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt closureOrNil;
@@ -70852,19 +70842,18 @@
if (!(((aContext & (tagMask())) == 0)
&& (((longAt(aContext)) & (classIndexMask())) == ClassMethodContextCompactIndex))) {
- return;
+ return null;
}
closureOrNil = longAt((aContext + BaseHeaderSize) + (((long)ClosureIndex) << (shiftForWord())));
if (closureOrNil == GIV(nilObj)) {
- return;
+ return aContext;
}
if (((((tagBits = closureOrNil & (tagMask()))) != 0
? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (((long)tagBits) << (shiftForWord())))
: fetchClassOfNonImm(closureOrNil))) != (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)ClassBlockClosure) << (shiftForWord()))))) {
- return;
+ return null;
}
- findHomeForContext(longAt((closureOrNil + BaseHeaderSize) + (((long)ClosureOuterContextIndex) << (shiftForWord()))));
- return;
+ return findHomeForContext(longAt((closureOrNil + BaseHeaderSize) + (((long)ClosureOuterContextIndex) << (shiftForWord()))));
}
@@ -70872,9 +70861,13 @@
findMethodWithPrimitive:FromFP:SP:ThroughContext: instead of iterative.
We're doing the simplest thing that could possibly work. Niceties can
wait. */
+/* Being mutually-recursive with findMethodWithPrimitive:FromFP:UpToContext:
+ gives the author's type inference algorithm headaches. Wimp out by
+ declaring the return type.
+ */
/* StackInterpreter>>#findMethodWithPrimitive:FromContext:UpToContext: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt callerContextOrNil;
@@ -70897,23 +70890,23 @@
theContext = senderContext;
while (1) {
if (theContext == GIV(nilObj)) {
- return;
+ return theContext;
}
if (((((longAt((theContext + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)) break;
if (theContext == homeContext) {
- return;
+ return 0;
}
if (!((primitive == 0)
|| ((longAt((theContext + BaseHeaderSize) + (((long)ClosureIndex) << (shiftForWord())))) != GIV(nilObj)))) {
theMethod = longAt((theContext + BaseHeaderSize) + (((long)MethodIndex) << (shiftForWord())));
if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == primitive) {
- return;
+ return theContext;
}
}
theContext = longAt((theContext + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord())));
}
if (isWidowedContext(theContext)) {
- return;
+ return GIV(nilObj);
}
/* begin findMethodWithPrimitive:FromFP:UpToContext: */
senderOop = longAt((theContext + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord())));
@@ -70927,7 +70920,7 @@
? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0
: (byteAt((theFP + FoxIFrameFlags) + 2)) != 0))
&& (homeContext == (longAt(theFP + FoxThisContext)))) {
- return;
+ return 0;
}
if (!((primitive == 0)
|| (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
@@ -70952,11 +70945,9 @@
? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0
: (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) {
assert(isContext(frameContext(theFP)));
- longAt(theFP + FoxThisContext);
- return;
+ return longAt(theFP + FoxThisContext);
}
- marryFrameSP(theFP, theSP);
- return;
+ return marryFrameSP(theFP, theSP);
}
}
theFPAbove = theFP;
@@ -70975,10 +70966,9 @@
senderContext1 = callerContextOrNil;
if (!(((senderContext1 & (tagMask())) == 0)
&& (((longAt(senderContext1)) & (classIndexMask())) == ClassMethodContextCompactIndex))) {
- return;
+ return GIV(nilObj);
}
- findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext1, homeContext);
- return;
+ return findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext1, homeContext);
}
/* StackInterpreter>>#findSelectorOfMethod: */
@@ -72405,7 +72395,7 @@
}
/* StackInterpreter>>#lengthOfNameOfClass: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
lengthOfNameOfClass(sqInt classOop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt fmt;
@@ -72423,11 +72413,10 @@
? ((usqInt) (((unsigned long)(((long)(longAt(classOop - BaseHeaderSize))) << 8)))) >> 8
: numSlots1);
if (numSlots == GIV(metaclassNumSlots)) {
- lengthOfNameOfClass(longAt((classOop + BaseHeaderSize) + (((long)GIV(thisClassIndex)) << (shiftForWord()))));
- return;
+ return lengthOfNameOfClass(longAt((classOop + BaseHeaderSize) + (((long)GIV(thisClassIndex)) << (shiftForWord()))));
}
if (numSlots <= GIV(classNameIndex)) {
- return;
+ return 0;
}
/* begin lengthOf: */
objOop = longAt((classOop + BaseHeaderSize) + (((long)GIV(classNameIndex)) << (shiftForWord())));
@@ -72439,26 +72428,23 @@
? ((usqInt) (((unsigned long)(((long)(longAt(objOop - BaseHeaderSize))) << 8)))) >> 8
: numSlots11);
if (fmt <= 5) {
- return;
+ return numSlots2;
}
if (fmt >= (firstByteFormat())) {
/* bytes, including CompiledMethod */
- (((long)numSlots2) << (shiftForWord())) - (fmt & 7);
- return;
+ return (((long)numSlots2) << (shiftForWord())) - (fmt & 7);
}
if (fmt >= (firstShortFormat())) {
- (((long)numSlots2) << ((shiftForWord()) - 1)) - (fmt & 3);
- return;
+ return (((long)numSlots2) << ((shiftForWord()) - 1)) - (fmt & 3);
}
if (fmt >= (firstLongFormat())) {
- (((long)numSlots2) << ((shiftForWord()) - 2)) - (fmt & 1);
- return;
+ return (((long)numSlots2) << ((shiftForWord()) - 2)) - (fmt & 1);
}
if (fmt == (sixtyFourBitIndexableFormat())) {
- return;
+ return numSlots2;
}
- return;
+ return 0;
}
/* StackInterpreter>>#literal:ofMethod: */
@@ -72958,7 +72944,7 @@
}
/* StackInterpreter>>#lookupMethodInClass: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
lookupMethodInClass(sqInt class)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt currentClass;
@@ -72998,8 +72984,7 @@
GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorCannotInterpret) << (shiftForWord())));
/* begin sendBreakpoint:receiver: */
sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), null);
- lookupMethodInClass(followFieldofObject(SuperclassIndex, currentClass));
- return;
+ return lookupMethodInClass(followFieldofObject(SuperclassIndex, currentClass));
}
/* begin lookupMethodInDictionary: */
flag("endianness");
@@ -73104,7 +73089,7 @@
found = 0;
l1: /* end lookupMethodInDictionary: */;
if (found) {
- return;
+ return currentClass;
}
/* begin followField:ofObject: */
objOop1 = longAt((currentClass + BaseHeaderSize) + (((long)SuperclassIndex) << (shiftForWord())));
@@ -73120,8 +73105,7 @@
createActualMessageTo(class);
GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorDoesNotUnderstand) << (shiftForWord())));
sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOfformat(GIV(messageSelector), (((usqInt) (longAt(GIV(messageSelector)))) >> (formatShift())) & (formatMask())), null);
- lookupMethodInClass(class);
- return;
+ return lookupMethodInClass(class);
}
@@ -75664,26 +75648,24 @@
}
/* StackInterpreter>>#printCallStackOf: */
-void
+sqInt
printCallStackOf(sqInt aContextOrProcessOrFrame)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt context;
if ((((((usqInt)aContextOrProcessOrFrame)) & (BytesPerWord - 1)) == 0)
&& ((((((usqInt)aContextOrProcessOrFrame)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)aContextOrProcessOrFrame)) <= (((usqInt)GIV(pages))))))) {
- printCallStackFP(((char *) aContextOrProcessOrFrame));
- return;
+ return printCallStackFP(((char *) aContextOrProcessOrFrame));
}
if (couldBeProcess(aContextOrProcessOrFrame)) {
- printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (((long)SuspendedContextIndex) << (shiftForWord()))));
- return;
+ return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (((long)SuspendedContextIndex) << (shiftForWord()))));
}
context = aContextOrProcessOrFrame;
while (!(context == GIV(nilObj))) {
if (((((longAt((context + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)) {
if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) {
shortPrintContext(context);
- return;
+ return null;
}
context = shortReversePrintFrameAndCallers(frameOfMarriedContext(context));
}
@@ -77568,7 +77550,7 @@
}
/* StackInterpreter>>#printStackCallStackOf: */
-void
+sqInt
printStackCallStackOf(sqInt aContextOrProcessOrFrame)
{
sqInt context;
@@ -77578,14 +77560,12 @@
if ((((aContextOrProcessOrFrame & (tagMask())) == 0)
&& (((longAt(aContextOrProcessOrFrame)) & (classIndexMask())) == ClassMethodContextCompactIndex))
&& (checkIsStillMarriedContextcurrentFP(aContextOrProcessOrFrame, null))) {
- printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame))));
- return;
+ return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame))));
}
if (couldBeProcess(aContextOrProcessOrFrame)) {
- printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (((long)SuspendedContextIndex) << (shiftForWord()))));
- return;
+ return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (((long)SuspendedContextIndex) << (shiftForWord()))));
}
- return;
+ return null;
}
theFP = ((void *)aContextOrProcessOrFrame);
@@ -77594,7 +77574,7 @@
if (!((((((longAt((context + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1))
&& (((theFP = frameOfMarriedContext(context)),
checkIsStillMarriedContextcurrentFP(context, theFP))))) {
- return;
+ return null;
}
}
}
Modified: branches/Cog/nsspur64src/vm/cointerp.h
===================================================================
--- branches/Cog/nsspur64src/vm/cointerp.h 2016-01-23 00:34:50 UTC (rev 3565)
+++ branches/Cog/nsspur64src/vm/cointerp.h 2016-01-23 01:47:33 UTC (rev 3566)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1664 uuid: 9e676eea-f638-4da0-bd70-920a096bda28
*/
@@ -42,9 +42,9 @@
extern sqInt ceReturnToInterpreter(sqInt anOop);
extern void ceSelfSendreceiver(sqInt cacheAddress, sqInt methodReceiver);
extern sqInt ceSendAborttonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs);
-extern void ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC);
+extern sqInt ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC);
extern sqInt ceSendMustBeBoolean(sqInt anObject);
-extern void ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs);
+extern sqInt ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs);
extern void ceStackOverflow(sqInt contextSwitchIfNotNil);
extern void ceTraceBlockActivation(void);
extern void ceTraceLinkedSend(sqInt theReceiver);
@@ -283,7 +283,7 @@
extern sqInt primitiveIndexOfMethodheader(sqInt theMethod, sqInt methodHeader);
extern sqInt primitiveIndexOf(sqInt methodPointer);
extern void printAllStacks(void);
-extern void printCallStackOf(sqInt aContextOrProcessOrFrame);
+extern sqInt printCallStackOf(sqInt aContextOrProcessOrFrame);
extern void printChar(sqInt aByte);
extern void printHex(sqInt n);
extern void printLikelyImplementorsOfSelector(sqInt selector);
@@ -292,7 +292,7 @@
extern void printMethodDictionary(sqInt dictionary);
extern void printProcessStack(sqInt aProcess);
extern sqInt printProcsOnList(sqInt procList);
-extern void printStackCallStackOf(sqInt aContextOrProcessOrFrame);
+extern sqInt printStackCallStackOf(sqInt aContextOrProcessOrFrame);
extern void printStackReferencesTo(sqInt oop);
extern void print(char *s);
extern void setBreakMNUSelector(char *aString);
Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-01-23 00:34:50 UTC (rev 3565)
+++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-01-23 01:47:33 UTC (rev 3566)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1664 uuid: 9e676eea-f638-4da0-bd70-920a096bda28
from
- CoInterpreter VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5
+ CoInterpreter VMMaker.oscog-eem.1664 uuid: 9e676eea-f638-4da0-bd70-920a096bda28
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1664 uuid: 9e676eea-f638-4da0-bd70-920a096bda28 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -482,9 +482,9 @@
extern sqInt ceReturnToInterpreter(sqInt anOop);
extern void ceSelfSendreceiver(sqInt cacheAddress, sqInt methodReceiver);
extern sqInt ceSendAborttonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs);
-extern void ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC);
+extern sqInt ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC);
extern sqInt ceSendMustBeBoolean(sqInt anObject);
-extern void ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs);
+extern sqInt ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs);
extern void ceStackOverflow(sqInt contextSwitchIfNotNil);
extern void ceTraceBlockActivation(void);
extern void ceTraceLinkedSend(sqInt theReceiver);
@@ -530,7 +530,7 @@
extern sqInt getCurrentBytecode(void);
extern char * getFramePointer(void);
static sqInt NoDbgRegParms handleForwardedSendFaultForReceiverstackDelta(sqInt forwardedReceiver, sqInt stackDelta);
-static void NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage);
+static sqInt NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage);
static sqInt NoDbgRegParms iframeIsBlockActivation(char *theFP);
static sqInt NoDbgRegParms iframeReceiver(char *theFP);
static sqInt NoDbgRegParms iframeSavedIP(char *theFP);
@@ -1127,8 +1127,8 @@
static sqInt NoDbgRegParms isValidFreeObject(sqInt objOop);
static sqInt NoDbgRegParms isValidObjStackAt(sqInt objStackRootIndex);
static sqInt NoDbgRegParms isValidObjStackPagemyIndex(sqInt objStackPage, sqInt myx);
-static void NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage);
-static void NoDbgRegParms isValidObjStack(sqInt objStack);
+static sqInt NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage);
+static sqInt NoDbgRegParms isValidObjStack(sqInt objStack);
static sqInt NoDbgRegParms isWeakFormat(sqInt format);
static sqInt NoDbgRegParms isWeakNonImm(sqInt objOop);
extern sqInt isWeak(sqInt oop);
@@ -1346,8 +1346,8 @@
static sqInt NoDbgRegParms findClassContainingMethodstartingAt(sqInt meth, sqInt classObj);
extern sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr);
static char * NoDbgRegParms findFrameAboveinPage(char *theFP, StackPage *thePage);
-static void NoDbgRegParms findHomeForContext(sqInt aContext);
-static void NoDbgRegParms findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext);
+static sqInt NoDbgRegParms findHomeForContext(sqInt aContext);
+static sqInt NoDbgRegParms findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext);
extern sqInt findSelectorOfMethod(sqInt methArg);
static char * NoDbgRegParms findSPOfon(char *theFP, StackPage *thePage);
static sqInt NoDbgRegParms findUnwindThroughContext(sqInt homeContext);
@@ -1402,7 +1402,7 @@
extern sqInt isKindOfClass(sqInt oop, sqInt aClass);
extern sqInt isKindOf(sqInt oop, char *className);
extern sqInt isMemberOf(sqInt oop, char *className);
-static void NoDbgRegParms lengthOfNameOfClass(sqInt classOop);
+static sqInt NoDbgRegParms lengthOfNameOfClass(sqInt classOop);
extern sqInt literalofMethod(sqInt offset, sqInt methodPointer);
extern sqInt loadBitBltFrom(sqInt bb);
extern void loadInitialContext(void);
@@ -1410,7 +1410,7 @@
extern sqInt longStoreBytecodeForHeader(sqInt methodHeader);
static sqInt NoDbgRegParms lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag);
static sqInt NoDbgRegParms lookupLexicalfromrule(sqInt selector, sqInt mixin, sqInt rule);
-static void NoDbgRegParms lookupMethodInClass(sqInt class);
+static sqInt NoDbgRegParms lookupMethodInClass(sqInt class);
static sqInt lookupMNU(void);
static sqInt NoDbgRegParms lookupMNUInClass(sqInt class);
static sqInt NoDbgRegParms lookupOrdinaryNoMNUEtcInClass(sqInt class);
@@ -1456,7 +1456,7 @@
extern void printAllStacks(void);
extern void printCallStack(void);
static sqInt NoDbgRegParms printCallStackFP(char *theFP);
-extern void printCallStackOf(sqInt aContextOrProcessOrFrame);
+extern sqInt printCallStackOf(sqInt aContextOrProcessOrFrame);
static sqInt NoDbgRegParms printCallStackOfcurrentFP(sqInt aContext, char *currFP);
extern void printChar(sqInt aByte);
static sqInt NoDbgRegParms printContextCallStackOf(sqInt aContext);
@@ -1481,7 +1481,7 @@
extern void printOop(sqInt oop);
extern void printProcessStack(sqInt aProcess);
extern sqInt printProcsOnList(sqInt procList);
-extern void printStackCallStackOf(sqInt aContextOrProcessOrFrame);
+extern sqInt printStackCallStackOf(sqInt aContextOrProcessOrFrame);
extern void printStackPageList(void);
extern void printStackPageListInUse(void);
extern void printStackPages(void);
@@ -2439,7 +2439,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1662";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1664";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -18268,7 +18268,7 @@
/* self printStringOf: selector */
/* CoInterpreter>>#ceSendFromInLineCacheMiss: */
-void
+sqInt
ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt classObj;
@@ -18323,13 +18323,11 @@
else {
if (isOopForwarded((cogMethodOrPIC->selector))) {
handleForwardedSelectorFaultFor((cogMethodOrPIC->selector));
- ceSendFromInLineCacheMiss(cogMethodOrPIC);
- return;
+ return ceSendFromInLineCacheMiss(cogMethodOrPIC);
}
if (classTag == (isForwardedObjectClassIndexPun())) {
handleForwardedSendFaultForReceiverstackDelta(rcvr, 1);
- ceSendFromInLineCacheMiss(cogMethodOrPIC);
- return;
+ return ceSendFromInLineCacheMiss(cogMethodOrPIC);
}
GIV(messageSelector) = (cogMethodOrPIC->selector);
/* begin classAtIndex: */
@@ -18362,8 +18360,7 @@
executeNewMethod();
assert(0);
}
- interpretMethodFromMachineCode();
- return;
+ return interpretMethodFromMachineCode();
}
/* CoInterpreter>>#ceSendMustBeBoolean: */
@@ -18406,7 +18403,7 @@
cogged or not. */
/* CoInterpreter>>#ceSend:super:to:numArgs: */
-void
+sqInt
ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt classObj;
@@ -18493,13 +18490,11 @@
else {
if (((selector & (tagMask())) == 0)
&& (((longAt(selector)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
- ceSendsupertonumArgs(handleForwardedSelectorFaultFor(selector), superNormalBar, rcvr, numArgs);
- return;
+ return ceSendsupertonumArgs(handleForwardedSelectorFaultFor(selector), superNormalBar, rcvr, numArgs);
}
if (classTag == (isForwardedObjectClassIndexPun())) {
assert(superNormalBar == 0);
- ceSendsupertonumArgs(selector, superNormalBar, handleForwardedSendFaultForReceiverstackDelta(rcvr, 1), numArgs);
- return;
+ return ceSendsupertonumArgs(selector, superNormalBar, handleForwardedSendFaultForReceiverstackDelta(rcvr, 1), numArgs);
}
GIV(messageSelector) = selector;
/* begin classAtIndex: */
@@ -18571,8 +18566,7 @@
top1 = longAt(GIV(stackPointer));
GIV(stackPointer) += BytesPerWord;
GIV(instructionPointer) = top1;
- interpretMethodFromMachineCode();
- return;
+ return interpretMethodFromMachineCode();
}
@@ -18709,7 +18703,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -20268,7 +20262,7 @@
method. messageSelector is an implicit argument (yuck). */
/* CoInterpreter>>#handleMNU:InMachineCodeTo:classForMessage: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt classForThisMessage;
@@ -20317,8 +20311,7 @@
/* begin push: */
longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer));
GIV(stackPointer) = sp;
- handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForThisMessage);
- return;
+ return handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForThisMessage);
}
}
if (((GIV(newMethod) & (tagMask())) == 0)
@@ -20330,8 +20323,7 @@
executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(GIV(newMethod)), rcvr);
assert(0);
}
- interpretMethodFromMachineCode();
- return;
+ return interpretMethodFromMachineCode();
}
@@ -54162,7 +54154,7 @@
/* Answer if the obj stack at stackRootIndex is valid. */
/* SpurMemoryManager>>#isValidObjStackPage:myIndex:firstPage: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt freeOrNextPage;
@@ -54171,33 +54163,33 @@
sqInt page;
if (!(isValidObjStackPagemyIndex(objStackPage, myx))) {
- return;
+ return 0;
}
freeOrNextPage = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackFreex) << (shiftForWord())));
while (freeOrNextPage != 0) {
if (!isFirstPage) {
GIV(objStackInvalidBecause) = "free page on other than first page";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
if (freeOrNextPage == (longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackNextx) << (shiftForWord()))))) {
GIV(objStackInvalidBecause) = "free page = next page";
GIV(invalidObjStackPage) = freeOrNextPage;
- return;
+ return 0;
}
if (!(isValidObjStackPagemyIndex(freeOrNextPage, myx))) {
ns = malloc(((strlen(GIV(objStackInvalidBecause))) + (strlen(", on next page"))) + 2);
strcpy(ns, GIV(objStackInvalidBecause));
GIV(objStackInvalidBecause) = strcat(ns, ", on next page");
- return;
+ return 0;
}
page = longAt((freeOrNextPage + BaseHeaderSize) + (((long)ObjStackFreex) << (shiftForWord())));
if ((page == freeOrNextPage)
|| (page == objStackPage)) {
GIV(objStackInvalidBecause) = "circularity in free page list";
GIV(invalidObjStackPage) = page;
- return;
+ return 0;
}
freeOrNextPage = page;
}
@@ -54205,48 +54197,46 @@
if (!(((myx >= (1LL << (22 - (classTableMajorIndexShift())))) && (myx <= (((1LL << (22 - (classTableMajorIndexShift()))) + 8) - 1))))) {
GIV(objStackInvalidBecause) = "myx out of range";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
if (!((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)myx) << (shiftForWord())))) == objStackPage)) {
GIV(objStackInvalidBecause) = "firstPage is not root";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
}
index = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackTopx) << (shiftForWord())));
if (!(((index >= 0) && (index <= ObjStackLimit)))) {
GIV(objStackInvalidBecause) = "bad topx";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
freeOrNextPage = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackNextx) << (shiftForWord())));
if (freeOrNextPage == 0) {
- return;
+ return 1;
}
if (freeOrNextPage == objStackPage) {
GIV(objStackInvalidBecause) = "circularity in objStack page list";
GIV(invalidObjStackPage) = objStackPage;
- return;
+ return 0;
}
- isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0);
- return;
+ return isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0);
}
/* Answer if the obj stack at objStackRootIndex is valid. */
/* SpurMemoryManager>>#isValidObjStack: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
isValidObjStack(sqInt objStack)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
if (!((addressCouldBeObj(objStack))
&& ((numSlotsOfAny(objStack)) == ObjStackPageSlots))) {
GIV(objStackInvalidBecause) = "first page not obj or wrong size";
GIV(invalidObjStackPage) = objStack;
- return;
+ return 0;
}
- isValidObjStackPagemyIndexfirstPage(objStack, longAt((objStack + BaseHeaderSize) + (((long)ObjStackMyx) << (shiftForWord()))), 1);
- return;
+ return isValidObjStackPagemyIndexfirstPage(objStack, longAt((objStack + BaseHeaderSize) + (((long)ObjStackMyx) << (shiftForWord()))), 1);
}
/* SpurMemoryManager>>#isWeakFormat: */
@@ -67470,7 +67460,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -67812,7 +67802,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- usqInt pier2;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -70853,7 +70843,7 @@
}
/* StackInterpreter>>#findHomeForContext: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
findHomeForContext(sqInt aContext)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt closureOrNil;
@@ -70861,19 +70851,18 @@
if (!(((aContext & (tagMask())) == 0)
&& (((longAt(aContext)) & (classIndexMask())) == ClassMethodContextCompactIndex))) {
- return;
+ return null;
}
closureOrNil = longAt((aContext + BaseHeaderSize) + (((long)ClosureIndex) << (shiftForWord())));
if (closureOrNil == GIV(nilObj)) {
- return;
+ return aContext;
}
if (((((tagBits = closureOrNil & (tagMask()))) != 0
? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (((long)tagBits) << (shiftForWord())))
: fetchClassOfNonImm(closureOrNil))) != (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)ClassBlockClosure) << (shiftForWord()))))) {
- return;
+ return null;
}
- findHomeForContext(longAt((closureOrNil + BaseHeaderSize) + (((long)ClosureOuterContextIndex) << (shiftForWord()))));
- return;
+ return findHomeForContext(longAt((closureOrNil + BaseHeaderSize) + (((long)ClosureOuterContextIndex) << (shiftForWord()))));
}
@@ -70881,9 +70870,13 @@
findMethodWithPrimitive:FromFP:SP:ThroughContext: instead of iterative.
We're doing the simplest thing that could possibly work. Niceties can
wait. */
+/* Being mutually-recursive with findMethodWithPrimitive:FromFP:UpToContext:
+ gives the author's type inference algorithm headaches. Wimp out by
+ declaring the return type.
+ */
/* StackInterpreter>>#findMethodWithPrimitive:FromContext:UpToContext: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt callerContextOrNil;
@@ -70906,23 +70899,23 @@
theContext = senderContext;
while (1) {
if (theContext == GIV(nilObj)) {
- return;
+ return theContext;
}
if (((((longAt((theContext + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)) break;
if (theContext == homeContext) {
- return;
+ return 0;
}
if (!((primitive == 0)
|| ((longAt((theContext + BaseHeaderSize) + (((long)ClosureIndex) << (shiftForWord())))) != GIV(nilObj)))) {
theMethod = longAt((theContext + BaseHeaderSize) + (((long)MethodIndex) << (shiftForWord())));
if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == primitive) {
- return;
+ return theContext;
}
}
theContext = longAt((theContext + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord())));
}
if (isWidowedContext(theContext)) {
- return;
+ return GIV(nilObj);
}
/* begin findMethodWithPrimitive:FromFP:UpToContext: */
senderOop = longAt((theContext + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord())));
@@ -70936,7 +70929,7 @@
? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0
: (byteAt((theFP + FoxIFrameFlags) + 2)) != 0))
&& (homeContext == (longAt(theFP + FoxThisContext)))) {
- return;
+ return 0;
}
if (!((primitive == 0)
|| (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
@@ -70961,11 +70954,9 @@
? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0
: (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) {
assert(isContext(frameContext(theFP)));
- longAt(theFP + FoxThisContext);
- return;
+ return longAt(theFP + FoxThisContext);
}
- marryFrameSP(theFP, theSP);
- return;
+ return marryFrameSP(theFP, theSP);
}
}
theFPAbove = theFP;
@@ -70984,10 +70975,9 @@
senderContext1 = callerContextOrNil;
if (!(((senderContext1 & (tagMask())) == 0)
&& (((longAt(senderContext1)) & (classIndexMask())) == ClassMethodContextCompactIndex))) {
- return;
+ return GIV(nilObj);
}
- findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext1, homeContext);
- return;
+ return findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext1, homeContext);
}
/* StackInterpreter>>#findSelectorOfMethod: */
@@ -72414,7 +72404,7 @@
}
/* StackInterpreter>>#lengthOfNameOfClass: */
-static void NoDbgRegParms
+static sqInt NoDbgRegParms
lengthOfNameOfClass(sqInt classOop)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt fmt;
@@ -72432,11 +72422,10 @@
? ((usqInt) (((unsigned long)(((long)(longAt(classOop - BaseHeaderSize))) << 8)))) >> 8
: numSlots1);
if (numSlots == GIV(metaclassNumSlots)) {
- lengthOfNameOfClass(longAt((classOop + BaseHeaderSize) + (((long)GIV(thisClassIndex)) << (shiftForWord()))));
- return;
+ return lengthOfNameOfClass(longAt((classOop + BaseHeaderSize) + (((long)GIV(thisClassIndex)) << (shiftForWord()))));
}
if (numSlots <= GIV(classNameIndex)) {
- return;
+ return 0;
}
/* begin lengthOf: */
objOop = longAt((classOop + BaseHeaderSize) + (((long)GIV(classNameIndex)) << (shiftForWord())));
@@ Diff output truncated at 50000 characters. @@
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1664.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1664
Author: eem
Time: 23 January 2016, 5:32:29.926128 pm
UUID: 9e676eea-f638-4da0-bd70-920a096bda28
Ancestors: VMMaker.oscog-eem.1663
And the type iferrence algorithm can't cope with mutual recursion, so break the log jam by explicitly typing findMethodWithPrimitive:FromContext:UpToContext: which is mutually recursive with findMethodWithPrimitive:FromFP:UpToContext:.
=============== Diff against VMMaker.oscog-eem.1663 ===============
Item was changed:
----- Method: StackInterpreter>>findMethodWithPrimitive:FromContext:UpToContext: (in category 'handler search') -----
findMethodWithPrimitive: primitive FromContext: senderContext UpToContext: homeContext
"See findUnwindThroughContext:. Alas this is mutually recursive with
findMethodWithPrimitive:FromFP:SP:ThroughContext: instead of iterative.
We're doing the simplest thing that could possibly work. Niceties can wait."
<inline: false>
+ <returnTypeC: #sqInt> "Being mutually-recursive with findMethodWithPrimitive:FromFP:UpToContext: gives the author's type inference algorithm headaches. Wimp out by declaring the return type."
| theContext theMethod |
self assert: (senderContext = objectMemory nilObject or: [objectMemory isContext: senderContext]).
self assert: (homeContext = objectMemory nilObject or: [objectMemory isContext: homeContext]).
theContext := senderContext.
[theContext = objectMemory nilObject ifTrue:
[^theContext].
self isMarriedOrWidowedContext: theContext] whileFalse:
[theContext = homeContext ifTrue: [^0].
(primitive = 0
or: [(objectMemory fetchPointer: ClosureIndex ofObject: theContext) ~= objectMemory nilObject]) ifFalse:
[theMethod := objectMemory fetchPointer: MethodIndex ofObject: theContext.
(self primitiveIndexOf: theMethod) = primitive ifTrue:
[^theContext]].
theContext := objectMemory fetchPointer: SenderIndex ofObject: theContext].
(self isWidowedContext: theContext) ifTrue:
[^objectMemory nilObject].
^self
findMethodWithPrimitive: primitive
FromFP: (self frameOfMarriedContext: theContext)
UpToContext: homeContext!
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1663.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.1663
Author: eem
Time: 23 January 2016, 4:58:59.147353 pm
UUID: a07a8c3d-4a04-48fc-bed8-f189f0494d6d
Ancestors: VMMaker.oscog-eem.1662
Slang: The previous fix surfaced a bug with addTypesFor:to:in: where it would misstate that a recursive method in the process of being typed could not be typed because the recursive call was as yet undetermined. The fix is simply to discount untyped recursive calls, since we're determining precisely that type and shouldn't abort.
=============== Diff against VMMaker.oscog-eem.1662 ===============
Item was changed:
----- Method: TMethod>>addTypesFor:to:in: (in category 'type inference') -----
addTypesFor: node to: typeSet in: aCodeGen
"Add the value tupes for the node to typeSet.
Answer if any type was derived from an as-yet-untyped method, which allows us to abort
inferReturnTypeFromReturnsIn: if the return type depends on a yet-to-be-typed method."
| expr |
expr := node.
[expr isAssignment or: [expr isStmtList]] whileTrue:
[expr isAssignment ifTrue:
[expr := expr variable].
expr isStmtList ifTrue:
[expr := expr statements last]].
expr isSend ifTrue:
[(#(ifTrue: ifFalse: ifTrue:ifFalse: ifFalse:ifTrue:) includes: expr selector) ifTrue:
[^expr args
inject: false
into: [:asYetUntyped :block|
asYetUntyped := asYetUntyped | (self addTypesFor: block to: typeSet in: aCodeGen)]].
(#(= ~= == ~~ < > <= >= anyMask: noMask:) includes: expr selector) ifTrue:
[typeSet add: #sqInt. ^false].
(#(+ - * / // \\ mod: quo: bitAnd: bitClear: bitOr: bitXor: bitShift:) includes: expr selector) ifTrue:
[| types |
types := Set new.
self addTypesFor: expr receiver to: types in: aCodeGen.
(types size = 1 and: [types anyOne last = $*]) ifTrue: "pointer arithmetic"
[typeSet add: types anyOne. ^false].
self addTypesFor: expr args first to: types in: aCodeGen.
types := aCodeGen harmonizeReturnTypesIn: types.
types size = 2 ifTrue:
[(types includes: #double) ifTrue:
[typeSet add: #double. ^false].
(types includes: #float) ifTrue:
[typeSet add: #float. ^false].
^false]. "don't know; leave unspecified."
types notEmpty ifTrue:
[typeSet add: types anyOne].
^false].
+ "Abort only for untyped methods that will be typed, but don't be phased by recursion."
^(aCodeGen returnTypeForSend: expr in: self)
ifNotNil: [:type| typeSet add: type. false]
+ ifNil: [(aCodeGen methodNamed: expr selector) notNil and: [expr selector ~~ selector]]].
- ifNil: [(aCodeGen methodNamed: expr selector) notNil]]. "Abort only for untyped methods that will be typed"
expr isVariable ifTrue:
[(aCodeGen typeOfVariable: expr name)
ifNotNil: [:type| typeSet add: type]
ifNil: [typeSet add: (expr name = 'self'
ifTrue: [#void]
ifFalse: [#sqInt])]].
expr isConstant ifTrue:
[| val |
val := expr value.
val isInteger ifTrue:
[typeSet add: ((val >= 0 ifTrue: [val] ifFalse: [-1 - val]) highBit <= 32
ifTrue: [#sqInt]
ifFalse: [#sqLong])].
(#(nil true false) includes: val) ifTrue:
[typeSet add: #sqInt].
val isFloat ifTrue:
[typeSet add: #float]].
^false!
1
0