[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.39.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 14 Dec '12
by squeak-dev-noreply＠lists.squeakfoundation.org 14 Dec '12
14 Dec '12
Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin:
http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces…
==================== Summary ====================
Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.39
Author: eem
Time: 14 December 2012, 12:44:27 pm
UUID: 75e5df6e-e4bd-4617-926c-cfc9191a71ab
Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38
Eschew using egregious hacks to generate FILEHANDLETYPE def
et al. This requires VMMaker.oscog-eem.235.
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.235.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.235
Author: eem
Time: 14 December 2012, 12:40:24.977 pm
UUID: 954df856-3f83-498c-9735-6cd3777ba9c7
Ancestors: VMMaker.oscog-eem.234
Fix doubling of include file declarations in plugins (now plugin
code is generated an exctra time to extract usedf functions we
must avoid adding headers twice in emitCHeaderOn:).
Provide a hook, InterpreterPlugin class>>exportBuildInfoOrNil, for
build info comments as in the UnixOSProcessPlugin.
Make constant generation look for method var and return types so
as not to nuke types introduced as #defines via
addConstantForBinding: (again a la UnixOSProcessPlugin).
EMit constants more carefully, not converting defs that contain a
comment into C literals, again so that UnixOSProcessPlugin can
declare FILEHANDLETYPE et al.
Add all headers through addHeaderFile[First]: so that warnings can
be issued aboud multiple defs etc.
Fix MNU handler for missing NullStream protocol as per trunk4.3.
Nuke a duplicate include in VMProfileMacSupportPlugin.
=============== Diff against VMMaker.oscog-eem.234 ===============
Item was changed:
----- Method: CCodeGenerator>>addHeaderFile: (in category 'public') -----
addHeaderFile: aString
+ "Add a header file. As a hack we allow C preprocessor defs such as #ifdef"
+ self assert: (('"<#' includes: aString first) or: [(aString last: 2) = '_H']).
+ (aString first ~= $#
+ and: [headerFiles includes: aString]) ifTrue:
+ [logger nextPutAll: 'warning, attempt to include ', aString, ' a second time'; cr; flush.
+ ^self].
+ headerFiles addLast: aString!
- "Add a header file. The argument must be a quoted string!!"
- headerFiles addLast: aString.!
Item was added:
+ ----- Method: CCodeGenerator>>addHeaderFileFirst: (in category 'public') -----
+ addHeaderFileFirst: aString
+ "Add a header file to the front of the sequence."
+ self assert: (('"<' includes: aString first) and: ['">' includes: aString last]).
+ self assert: (headerFiles includes: aString) not.
+ headerFiles addFirst: aString!
Item was changed:
----- Method: CCodeGenerator>>emitCConstantsOn: (in category 'C code generator') -----
emitCConstantsOn: aStream
"Store the global variable declarations on the given stream."
| unused constList |
unused := constants keys asSet.
"Don't generate any defines for the externally defined constants,
+ STACKVM, COGVM, COGMTVM et al, unless they're actually used."
- STACKVM, COGVM, COGMTVM et al, unless they're actuaslly used."
(VMClass class>>#initializeMiscConstantsWith:) literalsDo:
[:lit|
(lit isVariableBinding and: [lit key isString]) ifTrue:
[unused add: lit key]].
methods do:
[:meth|
+ meth declarations keysDo:
+ [:v|
+ (meth typeFor: v in: self) ifNotNil:
+ [:type| unused remove: type ifAbsent: []]].
+ unused remove: meth returnType ifAbsent: [].
meth parseTree nodesDo:
[:n| n isConstant ifTrue: [unused remove: n name ifAbsent: []]]].
unused copy do:
[:const|
(variableDeclarations anySatisfy: [:value| value includesSubString: const]) ifTrue:
[unused remove: const ifAbsent: []]].
unused remove: #BytesPerWord ifAbsent: []. "force inclusion of BytesPerWord declaration"
constList := constants keys reject: [:any| unused includes: any].
aStream cr; nextPutAll: '/*** Constants ***/'; cr.
(self sortStrings: constList) do:
[:varName| | node default value |
node := constants at: varName.
node name isEmpty ifFalse:
+ ["If the definition includes a C comment, take it as is, otherwise convert the value from Smalltalk to C.
+ Allow the class to provide an alternative definition, either of just the value or the whole shebang."
+ default := (node value isString and: [node value includesSubString: '/*'])
+ ifTrue: [node value]
+ ifFalse: [self cLiteralFor: node value name: varName].
- ["Allow the class to provide an alternative definition, either of just the value or the whole shebang"
- default := self cLiteralFor: node value name: varName.
value := vmClass
ifNotNil:
[(vmClass specialValueForConstant: node name default: default)
ifNotNil: [:specialDef| specialDef]
ifNil: [default]]
ifNil: [default].
value first ~= $# ifTrue:
[aStream nextPutAll: '#define '; nextPutAll: node name; space].
aStream nextPutAll: value; cr]].
aStream cr!
Item was changed:
----- Method: CCodeGenerator>>emitCHeaderOn: (in category 'C code generator') -----
emitCHeaderOn: aStream
"Emit the initial part of a source file on aStream, comprising the version stamp,
the global struct usage flags, the header files and preamble code."
| headerClass |
headerClass := [vmClass coreInterpreterClass]
on: MessageNotUnderstood
do: [:ex| vmClass].
aStream nextPutAll: (self fileHeaderVersionStampForSourceClass: headerClass); cr; cr.
self emitGlobalStructFlagOn: aStream.
+ self addHeaderFileFirst: '"sq.h"'.
- headerFiles addFirst: '"sq.h"'.
vmClass isInterpreterClass ifTrue:
+ [self addHeaderFile: '"sqMemoryAccess.h"'].
- [headerFiles addLast: '"sqMemoryAccess.h"'].
"Additional header files; include C library ones first."
self emitHeaderFiles: (headerFiles select: [:hdr| hdr includes: $<]) on: aStream.
"Additional header files; include squeak VM ones last"
self emitHeaderFiles: (headerFiles reject: [:hdr| hdr includes: $<]) on: aStream.
vmClass isInterpreterClass ifTrue:
[aStream cr; cr; nextPutAll: vmClass preambleCCode].
aStream cr!
Item was changed:
----- Method: CCodeGenerator>>fileHeaderVersionStampForSourceClass: (in category 'C code generator') -----
fileHeaderVersionStampForSourceClass: sourceClass
"Answer a suitable versiomn stamp to include in the header."
| exportBuildInfo slangDescription sourceDescription |
[exportBuildInfo := sourceClass isInterpreterClass
ifTrue: ['char *__interpBuildInfo = __buildInfo;']
ifFalse:
[sourceClass isCogitClass
+ ifTrue: ['char *__cogitBuildInfo = __buildInfo;']
+ ifFalse:
+ [sourceClass isPluginClass ifTrue:
+ [sourceClass exportBuildInfoOrNil]]]]
- ifTrue: ['char *__cogitBuildInfo = __buildInfo;']]]
on: MessageNotUnderstood
do: [:ex| ex resume: false].
[slangDescription := self monticelloDescriptionFor: self class.
sourceClass ifNotNil:
[sourceDescription := self monticelloDescriptionFor: sourceClass]]
on: Error
do: [:ex| | now |
now := Time dateAndTimeNow printString.
^String streamContents:
[:s|
s nextPutAll: '/* Automatically generated from Squeak on '.
s nextPutAll: now.
s nextPutAll: ' */'; cr; cr.
s nextPutAll: 'static char __buildInfo[] = "Generated on '.
s nextPutAll: now.
s nextPutAll: '. Compiled on "'.
s nextPutAll: '__DATE__ ;'; cr.
exportBuildInfo ifNotNil:
[s nextPutAll: exportBuildInfo; cr].
s cr]].
^String streamContents:
[:s|
s nextPutAll: '/* Automatically generated by'.
s crtab.
s nextPutAll: slangDescription.
sourceDescription ifNotNil:
[s cr; nextPutAll: ' from'; crtab; nextPutAll: sourceDescription].
s cr; nextPutAll: ' */'; cr.
sourceDescription ifNotNil:
[s nextPutAll: 'static char __buildInfo[] = "'.
s nextPutAll: sourceDescription.
s nextPutAll: ' " __DATE__ ;'; cr.
exportBuildInfo ifNotNil:
[s nextPutAll: exportBuildInfo; cr].
s cr]]!
Item was added:
+ ----- Method: InterpreterPlugin class>>exportBuildInfoOrNil (in category 'translation') -----
+ exportBuildInfoOrNil
+ "A hook for classes to emit some descriptive build string.
+ See CCodeGenerator>>fileHeaderVersionStampForSourceClass:"
+ ^nil!
Item was added:
+ ----- Method: InterpreterPlugin class>>isPluginClass (in category 'translation') -----
+ isPluginClass
+ ^true!
Item was added:
+ ----- Method: VMClass class>>isPluginClass (in category 'translation') -----
+ isPluginClass
+ "InterpreterPlugin class override this."
+ ^false!
Item was changed:
----- Method: VMPluginCodeGenerator>>emitCCodeOn:doInlining:doAssertions: (in category 'C code generator') -----
emitCCodeOn: aStream doInlining: inlineFlag doAssertions: assertionFlag
"Generate twice; the first time to collect the used functions, the second to output the used functions."
+ | savedHeaders |
+ savedHeaders := headerFiles copy.
[super emitCCodeOn: NullStream new doInlining: inlineFlag doAssertions: assertionFlag]
on: MessageNotUnderstood
do: [:ex|
+ (#(cr crtab: peekLast space tab tab:) includes: ex message selector) ifTrue:
- (#(peekLast tab: crtab:) includes: ex message selector) ifTrue:
[ex resume: nil].
ex pass].
+ headerFiles := savedHeaders.
super emitCCodeOn: aStream doInlining: inlineFlag doAssertions: assertionFlag!
Item was changed:
----- Method: VMPluginCodeGenerator>>emitCHeaderOn: (in category 'C code generator') -----
emitCHeaderOn: aStream
"Write a C file header onto the given stream."
aStream nextPutAll: (self fileHeaderVersionStampForSourceClass: pluginClass).
aStream cr; cr.
#('<math.h>' '<stdio.h>' '<stdlib.h>' '<string.h>' '<time.h>') reverseDo:
+ [:hdr| self addHeaderFileFirst: hdr].
- [:hdr| headerFiles addFirst: hdr].
"Additional header files; include C library ones first."
self emitHeaderFiles: (headerFiles select: [:hdr| hdr includes: $<]) on: aStream.
aStream cr; nextPutAll:'/* Default EXPORT macro that does nothing (see comment in sq.h): */
#define EXPORT(returnType) returnType
/* Do not include the entire sq.h file but just those parts needed. */
/* The virtual machine proxy definition */
#include "sqVirtualMachine.h"
/* Configuration options */
#include "sqConfig.h"
/* Platform specific definitions */
#include "sqPlatformSpecific.h"
#define true 1
#define false 0
#define null 0 /* using ''null'' because nil is predefined in Think C */
#ifdef SQUEAK_BUILTIN_PLUGIN
#undef EXPORT
// was #undef EXPORT(returnType) but screws NorCroft cc
#define EXPORT(returnType) static returnType
#endif'; cr; cr.
+ self addHeaderFile: '"sqMemoryAccess.h"'.
- headerFiles addLast: '"sqMemoryAccess.h"'.
"Additional header files; include squeak VM ones last"
self emitHeaderFiles: (headerFiles reject: [:hdr| hdr includes: $<]) on: aStream.
pluginClass preambleCCode ifNotNil:
[:preamble|
aStream cr; nextPutAll: preamble].
aStream cr.!
Item was changed:
----- Method: VMProfileMacSupportPlugin class>>declareCVarsIn: (in category 'translation') -----
declareCVarsIn: aCCodeGen
aCCodeGen
- addHeaderFile: '<stdlib.h>';
addHeaderFile: '<dlfcn.h>';
addHeaderFile: '<mach-o/dyld.h>';
addHeaderFile: '<mach-o/getsect.h>'!
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.233.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.233
Author: eem
Time: 12 December 2012, 12:22:33.362 pm
UUID: 8720e836-68d5-48bd-a664-5d39a9e2e211
Ancestors: VMMaker.oscog-eem.232
Change translation of symbols so that they are translated directly
and one does not need to use #asSymbol. This for e.g.
self cppIf: #'SA_ONSTACK' defined ifTrue: ...
The relevant changes to the code generator are
BlockNode>>isPotentialCCaseLabel
CCodeGenerator>>cFunctionNameFor:
CCodeGenerator>>cLiteralFor:
CCodeGenerator>>cLiteralFor:name:
CCodeGenerator>>generateFlag:on:indent:
CCodeGenerator>>initializeCTranslationDictionary
TConstantNode>>printOn:level:
TParseNode>>allCalls
with this convenience method added:
Symbol>>defined
All the others are corrected uses with the #asSymbol dropped.
=============== Diff against VMMaker.oscog-eem.232 ===============
Item was changed:
----- Method: BlockNode>>isPotentialCCaseLabel (in category '*VMMaker-C translation') -----
isPotentialCCaseLabel
| stmt |
^statements size = 1
and: [(stmt := statements first) isVariableNode
+ or: [(stmt isLiteralNode
+ and: [stmt isConstantNumber or: [stmt literalValue isSymbol]])
- or: [stmt isConstantNumber
or: [stmt isMessageNode
and: [stmt selector key = #asSymbol
+ and: [stmt receiver isLiteralNode
- and: [stmt receiver isLiteral
and: [stmt receiver literalValue isSymbol]]]]]]!
Item was changed:
----- Method: CCodeGenerator>>cFunctionNameFor: (in category 'C code generator') -----
cFunctionNameFor: aSelector
+ "Create a C function name from the given selector by finding
+ a specific translation, or if none, simply omitting colons."
- "Create a C function name from the given selector by omitting colons
- and prefixing with the plugin name if the method is exported."
^selectorTranslations at: aSelector ifAbsent: [aSelector copyWithout: $:]!
Item was changed:
----- Method: CCodeGenerator>>cLiteralFor: (in category 'C code generator') -----
cLiteralFor: anObject
"Return a string representing the C literal value for the given object."
anObject isNumber
ifTrue:
[anObject isInteger ifTrue:
[^(anObject < 16r7FFFFFFF)
ifTrue: [anObject printString]
ifFalse: [anObject printString , ObjectMemory unsignedIntegerSuffix]].
anObject isFloat ifTrue:
[^anObject printString]]
ifFalse:
+ [anObject isSymbol ifTrue:
+ [^self cFunctionNameFor: anObject].
+ anObject isString ifTrue:
- [anObject isString ifTrue:
[^'"', (anObject copyReplaceAll: (String with: Character cr) with: '\n') , '"'].
anObject == nil ifTrue: [^ 'null' ].
anObject == true ifTrue: [^ '1' ].
anObject == false ifTrue: [^ '0' ].
anObject isCharacter ifTrue:
[^anObject == $'
ifTrue: ['''\'''''] "i.e. '\''"
ifFalse: [anObject asString printString]]].
self error: 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString.
^'"XXX UNTRANSLATABLE CONSTANT XXX"'!
Item was changed:
----- Method: CCodeGenerator>>cLiteralFor:name: (in category 'C code generator') -----
cLiteralFor: anObject name: smalltalkName
+ "Return a string representing the C literal value for the given object.
+ This version may use hex for integers that are bit masks."
- "Return a string representing the C literal value for the given object."
anObject isInteger ifTrue:
[| hex dec rep |
hex := anObject printStringBase: 16.
dec := anObject printStringBase: 10.
rep := ((smalltalkName endsWith: 'Mask')
or: [anObject digitLength > 1
and: [(hex asSet size * 3) <= (dec asSet size * 2)
and: [(smalltalkName endsWith: 'Size') not]]])
ifTrue: [hex first = $- ifTrue: ['-0x', hex allButFirst] ifFalse: ['0x', hex]]
ifFalse: [dec].
^(anObject < 16r7FFFFFFF)
ifTrue: [rep]
ifFalse: [rep, ObjectMemory unsignedIntegerSuffix "ikp"]].
+ ^self cLiteralFor: anObject!
- anObject isFloat ifTrue:
- [^anObject printString].
- anObject isString ifTrue:
- [^'"', (anObject copyReplaceAll: (String with: Character cr) with: '\n') , '"'].
- anObject == nil ifTrue: [^ 'null' ].
- anObject == true ifTrue: [^ '1' ]. "ikp"
- anObject == false ifTrue: [^ '0' ]. "ikp"
- anObject isCharacter ifTrue:[^anObject asString printString]. "ar"
- self error: 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString.
- ^'"XXX UNTRANSLATABLE CONSTANT XXX"'!
Item was added:
+ ----- Method: CCodeGenerator>>generateFlag:on:indent: (in category 'C translation') -----
+ generateFlag: msgNode on: aStream indent: level
+ "Compoensate for the use of self flag: #aSymbol. We used to translate symbols
+ as strings unless they were quoted via #aSymbol asSymbol. But this is too tedious,
+ so we now translate symbols directly. The only use that this affected was in
+ self flag: #aSymbol,
+ so hard-code it to produce a string value. Note that this isn't strictly necessary
+ because there's a
+ #define flag(foo) 0
+ in C land, but it makes the generated C less dissonant."
+
+ aStream
+ nextPutAll: 'flag(';
+ nextPutAll: (self cLiteralFor: msgNode args last value asString);
+ nextPut: $)!
Item was changed:
----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') -----
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:
#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 #generateBitInvert32:on:indent:
#bitClear: #generateBitClear: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:
#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:
#signedIntFromLong #generateSignedIntFromLong:on:indent:
#signedIntToLong #generateSignedIntToLong:on:indent:
#signedIntFromShort #generateSignedIntFromShort: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:
#asUnsignedLong #generateAsUnsignedLong:on:indent:
#asSymbol #generateAsSymbol:on:indent:
+ #flag: #generateFlag:on:indent:
#anyMask: #generateBitAnd:on:indent:
#raisedTo: #generateRaisedTo:on:indent:
#touch: #generateTouch:on:indent:
#bytesPerWord #generateBytesPerWord:on:indent:
#baseHeaderSize #generateBaseHeaderSize: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:
#shouldNotImplement #generateSmalltalkMetaError:on:indent:
#shouldBeImplemented #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:
).
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>>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 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 nil out values that differ in the StackInterpreter."
+ FrameSlots := #undeclared.
- FrameSlots := #undeclared asSymbol.
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 := #undeclared.
- FoxCallerContext := #undeclared asSymbol.
FoxSavedFP := fxSavedFP * BytesPerWord.
FoxMethod := fxMethod * BytesPerWord.
FoxThisContext := fxThisContext * BytesPerWord.
+ FoxFrameFlags := #undeclared.
- FoxFrameFlags := #undeclared asSymbol.
FoxIFrameFlags := fxIFrameFlags * BytesPerWord.
FoxIFSavedIP := fxIFSavedIP * BytesPerWord.
+ FoxReceiver := #undeclared.
- FoxReceiver := #undeclared asSymbol.
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.
MFMethodFlagsMask := MFMethodFlagHasContextFlag + MFMethodFlagIsBlockFlag.
MFMethodMask := (MFMethodFlagsMask + 1) negated!
Item was changed:
----- Method: CoInterpreter>>addNewMethodToCache: (in category 'method lookup cache') -----
addNewMethodToCache: class
"Override to refuse to cache other than compiled methods.
This protects open PICs against having to test for compiled methods."
(objectMemory isOopCompiledMethod: newMethod) ifFalse:
+ [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod.
- [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod asSymbol.
^self].
super addNewMethodToCache: class!
Item was changed:
----- Method: CoInterpreter>>assertValidExecutionPointe:r:s:imbar: (in category 'debug support') -----
assertValidExecutionPointe: lip r: lifp s: lisp imbar: inInterpreter
<var: #lip type: #usqInt>
<var: #lifp type: #'char *'>
<var: #lisp type: #'char *'>
| methodField cogMethod |
<var: #cogMethod type: #'CogMethod *'>
self assert: stackPage = (stackPages stackPageFor: lifp).
self assert: stackPage = stackPages mostRecentlyUsedPage.
+ self deferStackLimitSmashAround: #assertValidStackLimits.
- self deferStackLimitSmashAround: #assertValidStackLimits asSymbol.
self assert: lifp < stackPage baseAddress.
self assert: lisp < lifp.
self assert: lifp > lisp.
self assert: lisp >= (stackPage realStackLimit - self stackLimitOffset).
self assert: (lifp - lisp) < LargeContextSize.
methodField := self frameMethodField: lifp.
inInterpreter
ifTrue:
[self assert: (self isMachineCodeFrame: lifp) not.
self assert: method = methodField.
self cppIf: MULTIPLEBYTECODESETS
ifTrue: [self assert: (self methodUsesAlternateBytecodeSet: method) = (bytecodeSetSelector = 256)].
((self asserta: methodField asUnsignedInteger > objectMemory startOfMemory)
and: [self asserta: methodField asUnsignedInteger < objectMemory freeStart]) ifTrue:
[lip ~= cogit ceReturnToInterpreterPC ifTrue:
[self assert: (lip >= (methodField + (objectMemory lastPointerOf: methodField) + BaseHeaderSize - 1)
and: [lip < (methodField + (objectMemory byteLengthOf: methodField) + BaseHeaderSize)])]].
self assert: ((self iframeIsBlockActivation: lifp)
or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self iframeReceiver: lifp)])]
ifFalse:
[self assert: (self isMachineCodeFrame: lifp).
((self asserta: methodField asUnsignedInteger >= cogit minCogMethodAddress)
and: [self asserta: methodField asUnsignedInteger < cogit maxCogMethodAddress]) ifTrue:
[cogMethod := self mframeHomeMethod: lifp.
self assert: (lip > (methodField + ((self mframeIsBlockActivation: lifp)
ifTrue: [self sizeof: CogBlockMethod]
ifFalse: [self sizeof: CogMethod]))
and: [lip < (methodField + cogMethod blockSize)])].
self assert: ((self mframeIsBlockActivation: lifp)
or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self mframeReceiver: lifp)])].
(self isBaseFrame: lifp) ifTrue:
[self assert: (self frameHasContext: lifp).
self assert: (self frameContext: lifp) = (stackPages longAt: stackPage baseAddress - BytesPerWord)]!
Item was changed:
----- Method: CoInterpreter>>bytecodePrimAt (in category 'common selector sends') -----
bytecodePrimAt
"BytecodePrimAt will only succeed if the receiver is in the atCache.
Otherwise it will fail so that the more general primitiveAt will put it in the
cache after validating that message lookup results in a primitive response.
Override to insert in the at: cache here. This is necessary since once there
is a compiled at: primitive method (which doesn't use the at: cache) the only
way something can get installed in the atCache is here."
| index rcvr result atIx |
index := self internalStackTop.
rcvr := self internalStackValue: 1.
((objectMemory isIntegerObject: rcvr) not
and: [objectMemory isIntegerObject: index]) ifTrue:
[atIx := rcvr bitAnd: AtCacheMask. "Index into atCache = 4N, for N = 0 ... 7"
(atCache at: atIx+AtCacheOop) ~= rcvr ifTrue:
[lkupClass := objectMemory fetchClassOfNonInt: rcvr.
messageSelector := self specialSelector: 16.
(self lookupInMethodCacheSel: messageSelector class: lkupClass) ifFalse:
[argumentCount := 1.
^self commonSend].
+ primitiveFunctionPointer == #primitiveAt
- primitiveFunctionPointer == #primitiveAt asSymbol
ifTrue: [self install: rcvr inAtCache: atCache at: atIx string: false]
ifFalse:
+ [primitiveFunctionPointer == #primitiveStringAt
- [primitiveFunctionPointer == #primitiveStringAt asSymbol
ifTrue: [self install: rcvr inAtCache: atCache at: atIx string: true]
ifFalse:
[argumentCount := 1.
^self commonSend]]].
self successful ifTrue:
[result := self commonVariable: rcvr at: (objectMemory integerValueOf: index) cacheIndex: atIx].
self successful ifTrue:
[self fetchNextBytecode.
^self internalPop: 2 thenPush: result].
self initPrimCall].
messageSelector := self specialSelector: 16.
argumentCount := 1.
self normalSend!
Item was changed:
----- Method: CoInterpreter>>bytecodePrimAtPut (in category 'common selector sends') -----
bytecodePrimAtPut
"BytecodePrimAtPut will only succeed if the receiver is in the atCache.
Otherwise it will fail so that the more general primitiveAtPut will put it in the
cache after validating that message lookup results in a primitive response.
Override to insert in the atCache here. This is necessary since once there
is a compiled at:[put:] primitive method (which doesn't use the at: cache) the
only way something can get installed in the atCache is here."
| index rcvr atIx value |
value := self internalStackTop.
index := self internalStackValue: 1.
rcvr := self internalStackValue: 2.
((objectMemory isIntegerObject: rcvr) not
and: [objectMemory isIntegerObject: index]) ifTrue:
[atIx := (rcvr bitAnd: AtCacheMask) + AtPutBase. "Index into atPutCache"
(atCache at: atIx+AtCacheOop) ~= rcvr ifTrue:
[lkupClass := objectMemory fetchClassOfNonInt: rcvr.
messageSelector := self specialSelector: 17.
(self lookupInMethodCacheSel: messageSelector class: lkupClass) ifFalse:
[argumentCount := 2.
^self commonSend].
+ primitiveFunctionPointer == #primitiveAtPut
- primitiveFunctionPointer == #primitiveAtPut asSymbol
ifTrue: [self install: rcvr inAtCache: atCache at: atIx string: false]
ifFalse:
+ [primitiveFunctionPointer == #primitiveStringAtPut
- [primitiveFunctionPointer == #primitiveStringAtPut asSymbol
ifTrue: [self install: rcvr inAtCache: atCache at: atIx string: true]
ifFalse:
[argumentCount := 2.
^self commonSend]]].
self successful ifTrue:
[self commonVariable: rcvr at: (objectMemory integerValueOf: index) put: value cacheIndex: atIx].
self successful ifTrue:
[self fetchNextBytecode.
^self internalPop: 3 thenPush: value].
self initPrimCall].
messageSelector := self specialSelector: 17.
argumentCount := 2.
self normalSend!
Item was changed:
----- Method: CoInterpreter>>callbackEnter: (in category 'callback support') -----
callbackEnter: callbackID
"Re-enter the interpreter for executing a callback"
| currentCStackPointer currentCFramePointer savedReenterInterpreter
wasInMachineCode calledFromMachineCode |
<volatile>
<export: true>
<var: #currentCStackPointer type: #'void *'>
<var: #currentCFramePointer type: #'void *'>
<var: #callbackID type: #'sqInt *'>
<var: #savedReenterInterpreter type: #'jmp_buf'>
"For now, do not allow a callback unless we're in a primitiveResponse"
(self asserta: primitiveFunctionPointer ~= 0) ifFalse:
[^false].
self assert: primFailCode = 0.
"Check if we've exceeded the callback depth"
(self asserta: jmpDepth < MaxJumpBuf) ifFalse:
[^false].
jmpDepth := jmpDepth + 1.
wasInMachineCode := self isMachineCodeFrame: framePointer.
calledFromMachineCode := instructionPointer <= objectMemory startOfMemory.
"Suspend the currently active process"
suspendedCallbacks at: jmpDepth put: self activeProcess.
"We need to preserve newMethod explicitly since it is not activated yet
and therefore no context has been created for it. If the caller primitive
for any reason decides to fail we need to make sure we execute the correct
method and not the one 'last used' in the call back"
suspendedMethods at: jmpDepth put: newMethod.
self flag: 'need to debug this properly. Conceptually it is the right thing to do but it crashes in practice'.
false
ifTrue:
["Signal external semaphores since a signalSemaphoreWithIndex: request may
have been issued immediately prior to this callback before the VM has any
chance to do a signalExternalSemaphores in checkForEventsMayContextSwitch:"
self signalExternalSemaphores.
"If no process is awakened by signalExternalSemaphores then transfer
to the highest priority runnable one."
(suspendedCallbacks at: jmpDepth) == self activeProcess ifTrue:
[self transferTo: self wakeHighestPriority from: CSCallbackLeave]]
ifFalse:
[self transferTo: self wakeHighestPriority from: CSCallbackLeave].
"Typically, invoking the callback means that some semaphore has been
signaled to indicate the callback. Force an interrupt check as soon as possible."
self forceInterruptCheck.
"Save the previous CStackPointers and interpreter entry jmp_buf."
currentCStackPointer := cogit getCStackPointer.
currentCFramePointer := cogit getCFramePointer.
self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf').
- y: (self sizeof: #'jmp_buf' asSymbol).
cogit assertCStackWellAligned.
(self setjmp: (jmpBuf at: jmpDepth)) == 0 ifTrue: "Fill in callbackID"
[callbackID at: 0 put: jmpDepth.
self enterSmalltalkExecutive.
self assert: false "NOTREACHED"].
"Restore the previous CStackPointers and interpreter entry jmp_buf."
cogit setCStackPointer: currentCStackPointer.
cogit setCFramePointer: currentCFramePointer.
self mem: reenterInterpreter
cp: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
+ y: (self sizeof: #'jmp_buf').
- y: (self sizeof: #'jmp_buf' asSymbol).
"Transfer back to the previous process so that caller can push result"
self putToSleep: self activeProcess yieldingIf: preemptionYields.
self transferTo: (suspendedCallbacks at: jmpDepth) from: CSCallbackLeave.
newMethod := suspendedMethods at: jmpDepth. "see comment above"
argumentCount := self argumentCountOf: newMethod.
self assert: wasInMachineCode = (self isMachineCodeFrame: framePointer).
calledFromMachineCode
ifTrue:
[instructionPointer >= objectMemory startOfMemory ifTrue:
[self iframeSavedIP: framePointer put: instructionPointer.
instructionPointer := cogit ceReturnToInterpreterPC]]
ifFalse:
["Even if the context was flushed to the heap and rebuilt in transferTo:from:
above it will remain an interpreted frame because the context's pc would
remain a bytecode pc. So the instructionPointer must also be a bytecode pc."
self assert: (self isMachineCodeFrame: framePointer) not.
self assert: instructionPointer > objectMemory startOfMemory].
self assert: primFailCode = 0.
jmpDepth := jmpDepth-1.
^true!
Item was changed:
----- Method: CoInterpreter>>flushExternalPrimitiveOf: (in category 'plugin primitive support') -----
flushExternalPrimitiveOf: methodObj
"methodObj is a CompiledMethod containing an external primitive.
Flush the function address and session ID of the CM. Override
to also flush the machine code call if one exists."
<api>
super flushExternalPrimitiveOf: methodObj.
(self methodHasCogMethod: methodObj) ifTrue:
[cogit
rewritePrimInvocationIn: (self cogMethodOf: methodObj)
+ to: #primitiveExternalCall]!
- to: #primitiveExternalCall asSymbol]!
Item was changed:
----- Method: CoInterpreter>>functionForPrimitiveExternalCall: (in category 'plugin primitives') -----
functionForPrimitiveExternalCall: methodObj
"Arrange to call the external primitive directly. The complication is arranging
that the call can be flushed, given that it is embedded in machine code."
<returnTypeC: 'void (*functionForPrimitiveExternalCall(sqInt methodObj))(void)'>
| lit index functionPointer |
<var: #functionPointer declareC: #'void (*functionPointer)(void)'>
+ cogit setPostCompileHook: #recordCallOffsetIn:of:.
- cogit setPostCompileHook: #recordCallOffsetIn:of: asSymbol.
(self literalCountOf: methodObj) > 0 ifFalse:
+ [^#primitiveExternalCall].
- [^#primitiveExternalCall asSymbol].
lit := self literal: 0 ofMethod: methodObj.
"Check if it's an array of length 4"
((objectMemory isArray: lit) and: [(objectMemory lengthOf: lit) = 4]) ifFalse:
+ [^#primitiveExternalCall].
- [^#primitiveExternalCall asSymbol].
index := objectMemory fetchPointer: 3 ofObject: lit.
((objectMemory isIntegerObject: index)
and: [(index := objectMemory integerValueOf: index) > 0
and: [index <= MaxExternalPrimitiveTableSize]]) ifFalse:
+ [^#primitiveExternalCall].
- [^#primitiveExternalCall asSymbol].
functionPointer := externalPrimitiveTable at: index - 1.
functionPointer = 0 ifTrue:
+ [^#primitiveExternalCall].
- [^#primitiveExternalCall asSymbol].
^functionPointer!
Item was changed:
----- Method: CoInterpreter>>functionPointerForCompiledMethod:primitiveIndex: (in category 'cog jit support') -----
functionPointerForCompiledMethod: methodObj primitiveIndex: primIndex
<api>
<returnTypeC: 'void (*functionPointerForCompiledMethodprimitiveIndex(sqInt methodObj, sqInt primIndex))(void)'>
| functionPointer |
<var: #functionPointer declareC: #'void (*functionPointer)(void)'>
functionPointer := self functionPointerFor: primIndex inClass: nil.
+ functionPointer == #primitiveAt ifTrue:
+ [^#primitiveNoAtCacheAt].
+ functionPointer == #primitiveAtPut ifTrue:
+ [^#primitiveNoAtCacheAtPut].
+ functionPointer == #primitiveStringAt ifTrue:
+ [^#primitiveNoAtCacheStringAt].
+ functionPointer == #primitiveStringAtPut ifTrue:
+ [^#primitiveNoAtCacheStringAtPut].
+ functionPointer == #primitiveCalloutToFFI ifTrue:
- functionPointer == #primitiveAt asSymbol ifTrue:
- [^#primitiveNoAtCacheAt asSymbol].
- functionPointer == #primitiveAtPut asSymbol ifTrue:
- [^#primitiveNoAtCacheAtPut asSymbol].
- functionPointer == #primitiveStringAt asSymbol ifTrue:
- [^#primitiveNoAtCacheStringAt asSymbol].
- functionPointer == #primitiveStringAtPut asSymbol ifTrue:
- [^#primitiveNoAtCacheStringAtPut asSymbol].
- functionPointer == #primitiveCalloutToFFI asSymbol ifTrue:
[^self functionForPrimitiveCallout].
+ functionPointer == #primitiveExternalCall ifTrue:
- functionPointer == #primitiveExternalCall asSymbol ifTrue:
[^self functionForPrimitiveExternalCall: methodObj].
^functionPointer!
Item was changed:
----- Method: CoInterpreter>>interpretAddress (in category 'trampoline support') -----
interpretAddress
"This is used for asserts that check that inline cache editing results in valid addresses.
In the C VM interpret is presumed to come before any primitives and so it constitutes
the lowest address in C code that machine code should be linked. In the simulator
we just answer something not low."
<api>
<returnTypeC: #usqInt>
+ ^self cCode: [(self addressOf: #interpret) asUnsignedInteger]
- ^self cCode: [(self addressOf: #interpret asSymbol) asUnsignedInteger]
inSmalltalk: [heapBase]!
Item was changed:
----- Method: CoInterpreter>>interpretMethodFromMachineCode (in category 'message sending') -----
interpretMethodFromMachineCode
"Execute a method interpretively from machine code. We assume (require) that newMethod
messageSelector, primitiveFunctionPointer and argumentCount have been set in the caller.
Once evaluated either continue in the interpreter via a jongjmp or in machine code via an
enilopmart (a form of longjmp - a stinking rose by any other name)."
<inline: false>
cogit assertCStackWellAligned.
self assert: (self validInstructionPointer: instructionPointer inFrame: framePointer).
primitiveFunctionPointer ~= 0
ifTrue:
+ [primitiveFunctionPointer = #primitiveInvokeObjectAsMethod
- [primitiveFunctionPointer = #primitiveInvokeObjectAsMethod asSymbol
ifTrue: [self assert: (objectMemory isOopCompiledMethod: newMethod) not]
ifFalse: [self assert: ((objectMemory isOopCompiledMethod: newMethod)
and: [(self primitiveIndexOf: newMethod) ~= 0])].
"Invoke an interpreter primitive (because the method is to be interpreted or has not yet been
compiled). This is very similar to invoking an interpreter primitive from a compiled primitive
(see e.g. SimpleStackBasedCogit>>compileInterpreterPrimitive:). Cut back the stack pointer
(done above) to skip the return address and invoke the function. On return if it has succeeded
simply continue otherwise restore the stackPointer, collect the pc and interpret. Note that
frame building primitives such as primitiveClosureValue, primitiveEvaluateMethod et al will not
return but will instead jump into either machine code or longjmp back to the interpreter."
"Assign stackPage headFP so we can tell if the primitive built a frame. We can't simply save
the framePointer since e.g. assignment to contexts (via primitiveInstVarAt:put:) can change the
framePointer. But context assignments will change both the framePointer and stackPage headFP."
stackPage headFP: framePointer.
self isPrimitiveFunctionPointerAnIndex
ifTrue:
[self externalQuickPrimitiveResponse.
primFailCode := 0]
ifFalse:
[self slowPrimitiveResponse].
self successful ifTrue:
[self return: self popStack toExecutive: false
"NOTREACHED"]]
ifFalse:
[self assert: ((objectMemory isOopCompiledMethod: newMethod)
and: [(self primitiveIndexOf: newMethod) = 0
or: [(self functionPointerFor: (self primitiveIndexOf: newMethod) inClass: objectMemory nilObject) = 0
or: [self isNullExternalPrimitiveCall: newMethod]]])].
"if not primitive, or primitive failed, activate the method and reenter the interpreter"
self activateNewMethod.
self siglong: reenterInterpreter jmp: ReturnToInterpreter.
"NOTREACHED"
^nil!
Item was changed:
----- Method: CoInterpreter>>primitiveFailAddress (in category 'trampoline support') -----
primitiveFailAddress
"This is used for asserts that check that inline cache editing results in valid addresses.
In the C VM interpret is presumed to come before any primitives and so it constitutes
the lowest address in C code that machine code should be linked, but optimizing
compilers change things around. In the simulator we just answer something not low."
<api>
<returnTypeC: #usqInt>
+ ^self cCode: [(self addressOf: #primitiveFail) asUnsignedInteger]
- ^self cCode: [(self addressOf: #primitiveFail asSymbol) asUnsignedInteger]
inSmalltalk: [heapBase]!
Item was changed:
----- Method: CoInterpreter>>primitivePropertyFlags: (in category 'cog jit support') -----
primitivePropertyFlags: primIndex
<api>
"Answer any special requirements of the given primitive"
| baseFlags functionPointer |
<var: #functionPointer declareC: 'void (*functionPointer)(void)'>
functionPointer := self functionPointerFor: primIndex inClass: nil.
baseFlags := profileSemaphore ~= objectMemory nilObject
ifTrue: [PrimCallNeedsNewMethod + PrimCallCollectsProfileSamples]
ifFalse: [0].
longRunningPrimitiveCheckSemaphore ~= nil ifTrue:
[baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod].
+ (functionPointer == #primitiveExternalCall
+ or: [functionPointer == #primitiveCalloutToFFI]) ifTrue: "For callbacks"
- (functionPointer == #primitiveExternalCall asSymbol
- or: [functionPointer == #primitiveCalloutToFFI asSymbol]) ifTrue: "For callbacks"
[baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod + PrimCallNeedsPrimitiveFunction + PrimCallMayCallBack].
^baseFlags!
Item was changed:
----- Method: CoInterpreter>>quickPrimitiveGeneratorFor: (in category 'cog jit support') -----
quickPrimitiveGeneratorFor: aQuickPrimitiveIndex
<api>
<returnTypeC: 'int (*quickPrimitiveGeneratorFor(sqInt aQuickPrimitiveIndex))(void)'>
^aQuickPrimitiveIndex
caseOf: {
+ [256] -> [#genQuickReturnSelf].
+ [257] -> [#genQuickReturnConst].
+ [258] -> [#genQuickReturnConst].
+ [259] -> [#genQuickReturnConst].
+ [260] -> [#genQuickReturnConst].
+ [261] -> [#genQuickReturnConst].
+ [262] -> [#genQuickReturnConst].
+ [263] -> [#genQuickReturnConst] }
+ otherwise: [#genQuickReturnInstVar]!
- [256] -> [#genQuickReturnSelf asSymbol].
- [257] -> [#genQuickReturnConst asSymbol].
- [258] -> [#genQuickReturnConst asSymbol].
- [259] -> [#genQuickReturnConst asSymbol].
- [260] -> [#genQuickReturnConst asSymbol].
- [261] -> [#genQuickReturnConst asSymbol].
- [262] -> [#genQuickReturnConst asSymbol].
- [263] -> [#genQuickReturnConst asSymbol] }
- otherwise: [#genQuickReturnInstVar asSymbol]!
Item was changed:
----- Method: CoInterpreter>>restoreCStackStateForCallbackContext: (in category 'callback support') -----
restoreCStackStateForCallbackContext: vmCallbackContext
<var: #vmCallbackContext type: #'VMCallbackContext *'>
cogit
setCStackPointer: vmCallbackContext savedCStackPointer;
setCFramePointer: vmCallbackContext savedCFramePointer.
self mem: reenterInterpreter
cp: (self cCoerceSimple: vmCallbackContext savedReenterInterpreter to: #'void *')
+ y: (self sizeof: #'jmp_buf')!
- y: (self sizeof: #'jmp_buf' asSymbol)!
Item was changed:
----- Method: CoInterpreter>>rewriteMethodCacheEntryForExternalPrimitiveToFunction: (in category 'method lookup cache') -----
rewriteMethodCacheEntryForExternalPrimitiveToFunction: localPrimAddress
"Rewrite an existing entry in the method cache with a new primitive function address.
Used by primitiveExternalCall to make direct calls to found external prims, or quickly
fail not found external prims.
Override to do the same to the machine code call. If methodObj has a cogged dual
rewrite the primitive call in it to call localPrimAddress. Used to update calls through
primitiveExternalCall to directly call the target function or to revert to calling
primitiveExternalCall after a flush."
<var: #localPrimAddress declareC: 'void (*localPrimAddress)(void)'>
<inline: false>
(self methodHasCogMethod: newMethod) ifTrue:
[cogit
rewritePrimInvocationIn: (self cogMethodOf: newMethod)
to: (localPrimAddress = 0
+ ifTrue: [self cCoerceSimple: #primitiveFail to: #'void (*)(void)']
- ifTrue: [self cCoerceSimple: #primitiveFail asSymbol to: #'void (*)(void)']
ifFalse: [localPrimAddress])].
(methodCache at: lastMethodCacheProbeWrite + MethodCacheMethod) = newMethod ifTrue:
[methodCache
at: lastMethodCacheProbeWrite + MethodCachePrimFunction
put: (self cCoerce: localPrimAddress to: #long)]!
Item was changed:
----- Method: CoInterpreter>>saveCStackStateForCallbackContext: (in category 'callback support') -----
saveCStackStateForCallbackContext: vmCallbackContext
<var: #vmCallbackContext type: #'VMCallbackContext *'>
vmCallbackContext
savedCStackPointer: cogit getCStackPointer;
savedCFramePointer: cogit getCFramePointer.
self mem: (self cCoerceSimple: vmCallbackContext savedReenterInterpreter to: #'void *')
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf')!
- y: (self sizeof: #'jmp_buf' asSymbol)!
Item was changed:
----- Method: CoInterpreterMT>>ownVM: (in category 'vm scheduling') -----
ownVM: threadIndexAndFlags
<api>
<inline: false>
"This is the entry-point for plugins and primitives that wish to reacquire the VM after having
released it via disownVM or callbacks that want to acquire it without knowing their ownership
status. This call will block until the VM is owned by the current thread or an error occurs.
The argument should be the value answered by disownVM, or 0 for callbacks that don't know
if they have disowned or not. This is both an optimization to avoid having to query thread-
local storage for the current thread's index (since it can easily keep it in some local variable),
and a record of when an unbound process becomes affined to a thread for the dynamic
extent of some operation.
Answer 0 if the current thread is known to the VM.
Answer 1 if the current thread is unknown to the VM and takes ownership.
Answer -1 if the current thread is unknown to the VM and fails to take ownership."
| threadIndex flags vmThread myProc activeProc sched |
<var: #vmThread type: #'CogVMThread *'>
threadIndexAndFlags = 0 ifTrue:
[^self ownVMFromUnidentifiedThread].
threadIndex := threadIndexAndFlags bitAnd: ThreadIdMask.
flags := threadIndexAndFlags >> DisownFlagsShift.
(flags anyMask: DisownVMForProcessorRelinquish) ifTrue:
[relinquishing := false.
self sqLowLevelMFence].
(threadIndexAndFlags anyMask: LockGUIThreadFlag) ifTrue:
[self assert: (noThreadingOfGUIThread and: [self inGUIThread]).
self assert: disowningVMThread = nil.
(flags anyMask: DisownVMLockOutFullGC) ifTrue:
[objectMemory decrementFullGCLock].
cogit recordEventTrace ifTrue:
[self recordTrace: TraceOwnVM thing: ConstZero source: 0].
^0].
vmThread := cogThreadManager acquireVMFor: threadIndex.
disownCount := disownCount - 1.
(flags anyMask: DisownVMLockOutFullGC) ifTrue:
[objectMemory decrementFullGCLock].
disowningVMThread notNil ifTrue:
[vmThread = disowningVMThread ifTrue:
[self cCode: ''
inSmalltalk:
[| range |
range := self cStackRangeForThreadIndex: threadIndex.
self assert: (range includes: cogit getCStackPointer).
self assert: (range includes: cogit getCFramePointer)].
self assert: self successful.
self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject.
disowningVMThread := nil.
cogit recordEventTrace ifTrue:
[self recordTrace: TraceOwnVM thing: ConstOne source: 0].
^0]. "if not preempted we're done."
self preemptDisowningThread].
"We've been preempted; we must restore state and update the threadId
in our process, and may have to put the active process to sleep."
activeProc := self activeProcess.
(threadIndexAndFlags anyMask: OwnVMForeignThreadFlag)
ifTrue:
[self assert: foreignCallbackProcessSlot == ForeignCallbackProcess.
myProc := objectMemory splObj: foreignCallbackProcessSlot.
self assert: myProc ~= objectMemory nilObject.
objectMemory splObj: foreignCallbackProcessSlot put: objectMemory nilObject]
ifFalse: [myProc := cogThreadManager popAWOLProcess: vmThread].
self assert: activeProc ~= myProc.
(activeProc ~= objectMemory nilObject
and: [(objectMemory fetchPointer: MyListIndex ofObject: activeProc) = objectMemory nilObject]) ifTrue:
[self putToSleep: activeProc yieldingIf: preemptionYields].
self assert: (objectMemory fetchPointer: MyListIndex ofObject: myProc) = (objectMemory splObj: ProcessInExternalCodeTag).
sched := self schedulerPointer.
objectMemory
storePointer: ActiveProcessIndex ofObject: sched withValue: myProc;
storePointerUnchecked: MyListIndex ofObject: myProc withValue: objectMemory nilObject.
"Only unaffine if the process was affined at this level and did not become bound in the interim."
((threadIndexAndFlags anyMask: ProcessUnaffinedOnDisown)
and: [(self isBoundProcess: myProc) not]) ifTrue:
[self setOwnerIndexOfProcess: myProc to: 0 bind: false].
self initPrimCall.
self externalSetStackPageAndPointersForSuspendedContextOfProcess: myProc.
"If this primitive is called from machine code maintain the invariant that the return pc
of an interpreter callee calling a machine code caller is ceReturnToInterpreterPC."
instructionPointer := self popStack.
(vmThread inMachineCode
and: [instructionPointer >= objectMemory startOfMemory]) ifTrue:
[self iframeSavedIP: framePointer put: instructionPointer.
instructionPointer := cogit ceReturnToInterpreterPC].
newMethod := vmThread newMethodOrNull.
argumentCount := vmThread argumentCount.
self cCode:
[self mem: reenterInterpreter
cp: vmThread reenterInterpreter
+ y: (self sizeof: #'jmp_buf')]
- y: (self sizeof: #'jmp_buf' asSymbol)]
inSmalltalk:
[reenterInterpreter := vmThread reenterInterpreter].
vmThread newMethodOrNull: nil.
self cCode: ''
inSmalltalk:
[| range |
range := self cStackRangeForThreadIndex: threadIndex.
self assert: (range includes: vmThread cStackPointer).
self assert: (range includes: vmThread cFramePointer)].
cogit setCStackPointer: vmThread cStackPointer.
cogit setCFramePointer: vmThread cFramePointer.
self assert: newMethod ~~ nil..
cogit recordEventTrace ifTrue:
[self recordTrace: TraceOwnVM thing: ConstTwo source: 0].
^threadIndexAndFlags bitAnd: OwnVMForeignThreadFlag!
Item was changed:
----- Method: CoInterpreterMT>>preemptDisowningThread (in category 'vm scheduling') -----
preemptDisowningThread
"Set the relevant state for disowningVMThread so that it can resume after
being preempted and set disowningVMThread to nil to indicate preemption.
N.B. This should only be sent from checkPreemptionOfDisowningThread.
There are essentially four things to do.
a) save the VM's notion of the current C stack pointers; these are pointers
into a thread's stack and must be saved and restored in thread switch.
b) save the VM's notion of the current Smalltalk execution point. This is
simply the suspend half of a process switch that saves the current context
in the current process.
c) add the process to the thread's set of AWOL processes so that the scheduler
won't try to run the process while the thread has disowned the VM.
d) save the in-primitive VM state, newMethod and argumentCount
ownVM: will restore the VM context as of disownVM: from the above when it
finds it has been preempted."
| activeProc activeContext preemptedThread |
<var: #preemptedThread type: #'CogVMThread *'>
<inline: false>
self assert: disowningVMThread notNil.
self assert: (disowningVMThread state = CTMUnavailable
or: [disowningVMThread state = CTMWantingOwnership]).
self cCode: ''
inSmalltalk:
[| range |
range := self cStackRangeForThreadIndex: disowningVMThread index.
self assert: (range includes: cogit getCStackPointer).
self assert: (range includes: cogit getCFramePointer)].
cogit recordEventTrace ifTrue:
[self recordTrace: TracePreemptDisowningThread
thing: (objectMemory integerObjectOf: disowningVMThread index)
source: 0].
disowningVMThread cStackPointer: cogit getCStackPointer.
disowningVMThread cFramePointer: cogit getCFramePointer.
activeProc := self activeProcess.
self assert: (objectMemory fetchPointer: MyListIndex ofObject: activeProc) = objectMemory nilObject.
objectMemory
storePointer: MyListIndex
ofObject: activeProc
withValue: (objectMemory splObj: ProcessInExternalCodeTag).
"The instructionPointer must be pushed because the convention for inactive stack pages is that the
instructionPointer is top of stack. We need to know if this primitive is called from machine code
because the invariant that the return pc of an interpreter callee calling a machine code caller is
ceReturnToInterpreterPC must be maintained."
self push: instructionPointer.
self externalWriteBackHeadFramePointers.
activeContext := self ensureFrameIsMarried: framePointer SP: stackPointer.
objectMemory
storePointer: SuspendedContextIndex
ofObject: activeProc
withValue: activeContext.
"Since pushing the awol process may realloc disowningVMThread we need to reassign.
But since we're going to nil disowningVMThread anyway we can assign to a local."
preemptedThread := cogThreadManager pushAWOLProcess: activeProc on: disowningVMThread.
disowningVMThread := nil.
preemptedThread priority: (self quickFetchInteger: PriorityIndex ofObject: activeProc).
(self ownerIndexOfProcess: activeProc) = 0
ifTrue: [self setOwnerIndexOfProcess: activeProc to: preemptedThread index bind: false]
ifFalse: [self assert: (self ownerIndexOfProcess: activeProc) = preemptedThread index].
preemptedThread
newMethodOrNull: newMethod;
argumentCount: argumentCount;
inMachineCode: instructionPointer asUnsignedInteger <= objectMemory startOfMemory.
self cCode:
[self mem: preemptedThread reenterInterpreter
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf')]
- y: (self sizeof: #'jmp_buf' asSymbol)]
inSmalltalk:
[preemptedThread reenterInterpreter: reenterInterpreter]!
Item was changed:
----- Method: CoInterpreterMT>>primitiveRelinquishProcessor (in category 'I/O primitives') -----
primitiveRelinquishProcessor
"Relinquish the processor for up to the given number of microseconds.
The exact behavior of this primitive is platform dependent.
Override to check for waiting threads."
| microSecs threadIndexAndFlags currentCStackPointer currentCFramePointer savedReenterInterpreter |
<var: #currentCStackPointer type: #'void *'>
<var: #currentCFramePointer type: #'void *'>
<var: #savedReenterInterpreter type: #'jmp_buf'>
microSecs := self stackTop.
(objectMemory isIntegerObject: microSecs) ifFalse:
[^self primitiveFail].
self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject.
self assert: relinquishing not.
"DO NOT allow relinquishing the processor while we are profiling since this
may skew the time base for our measures (it may reduce processor speed etc).
Instead we go full speed, therefore measuring the precise time we spend in the
inner idle loop as a busy loop."
nextProfileTick = 0 ifTrue:
"Presumably we have nothing to do; this primitive is typically called from the
background process. So we should /not/ try and activate any threads in the
pool; they will waste cycles finding there is no runnable process, and will
cause a VM abort if no runnable process is found. But we /do/ want to allow
FFI calls that have completed, or callbacks a chance to get into the VM; they
do have something to do. DisownVMForProcessorRelinquish indicates this."
[currentCStackPointer := cogit getCStackPointer.
currentCFramePointer := cogit getCFramePointer.
self cCode:
[self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf')].
- y: (self sizeof: #'jmp_buf' asSymbol)].
threadIndexAndFlags := self disownVM: DisownVMForProcessorRelinquish.
self assert: relinquishing.
self ioRelinquishProcessorForMicroseconds: (objectMemory integerValueOf: microSecs).
self assert: relinquishing.
self ownVM: threadIndexAndFlags.
self assert: relinquishing not.
self assert: cogThreadManager currentVMThread state = CTMAssignableOrInVM.
self assert: currentCStackPointer = cogit getCStackPointer.
self assert: currentCFramePointer = cogit getCFramePointer.
self cCode:
[self assert: (self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
cm: reenterInterpreter
+ p: (self sizeof: #'jmp_buf')) = 0]].
- p: (self sizeof: #'jmp_buf' asSymbol)) = 0]].
self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject.
self pop: 1 "microSecs; leave rcvr on stack"!
Item was changed:
----- Method: CoInterpreterMT>>returnToSchedulingLoopAndReleaseVMOrWakeThread:source: (in category 'process primitive support') -----
returnToSchedulingLoopAndReleaseVMOrWakeThread: vmThread source: source
| savedReenterInterpreter |
<var: #savedReenterInterpreter type: #'jmp_buf'>
<var: #vmThread type: #'CogVMThread *'>
<inline: false>
self cCode:
[self flag: 'this is just for debugging. Note the current C stack pointers'.
cogThreadManager currentVMThread
cStackPointer: cogit getCStackPointer;
cFramePointer: cogit getCFramePointer]
inSmalltalk:
[| range |
range := self cStackRangeForThreadIndex: cogThreadManager getVMOwner.
self assert: (range includes: cogit getCStackPointer).
self assert: (range includes: cogit getCFramePointer)].
"We must use a copy of reenterInterpreter since we're giving up the VM to another vmThread."
self cCode:
[self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf')]
- y: (self sizeof: #'jmp_buf' asSymbol)]
inSmalltalk:
[savedReenterInterpreter := reenterInterpreter].
self recordThreadSwitchTo: (vmThread ifNotNil: [vmThread index] ifNil: [0]) source: source.
vmThread
ifNotNil: [cogThreadManager wakeVMThreadFor: vmThread index]
ifNil: [cogThreadManager releaseVM].
"2 implies returning to the threadSchedulingLoop."
self siglong: savedReenterInterpreter jmp: ReturnToThreadSchedulingLoop!
Item was changed:
----- Method: CogObjectRepresentationForSqueakV3>>genAllocFloatValue:into:scratchReg:scratchReg: (in category 'compile abstract instructions') -----
genAllocFloatValue: dpreg into: resultReg scratchReg: scratch1 scratchReg: scratch2
<returnTypeC: #'AbstractInstruction *'>
| allocSize newFloatHeaderSansHash jumpFail |
<var: #jumpFail type: #'AbstractInstruction *'>
+ allocSize := BaseHeaderSize + (objectMemory sizeof: #double).
- allocSize := BaseHeaderSize + (objectMemory sizeof: #double asSymbol).
newFloatHeaderSansHash := ((objectMemory classFloatCompactIndex << objectMemory compactClassFieldLSB
bitOr: (objectMemory formatOfClass: objectMemory classFloat))
bitOr: allocSize)
bitOr: HeaderTypeShort.
cogit MoveAw: objectMemory freeStartAddress R: resultReg.
cogit MoveR: resultReg R: scratch1.
cogit AddCq: allocSize R: scratch1.
cogit MoveAw: objectMemory scavengeThresholdAddress R: scratch2.
cogit CmpR: scratch2 R: scratch1.
jumpFail := cogit JumpAboveOrEqual: 0.
cogit MoveR: resultReg R: scratch2.
self flag: #newObjectHash.
cogit AndCq: HashMaskUnshifted << BytesPerWord R: scratch2.
cogit LogicalShiftLeftCq: HashBitsOffset - BytesPerWord R: scratch2.
cogit OrCq: newFloatHeaderSansHash R: scratch2.
cogit MoveR: scratch2 Mw: 0 r: resultReg.
cogit MoveRd: dpreg M64: BaseHeaderSize r: resultReg.
cogit MoveR: scratch1 Aw: objectMemory freeStartAddress.
^jumpFail!
Item was changed:
----- Method: CogObjectRepresentationForSqueakV3>>genStoreCheckTrampoline (in category 'initialization') -----
genStoreCheckTrampoline
"Call noteAsRoot: with the object stored into"
^cogit
+ genTrampolineFor: #ceStoreCheck:
- genTrampolineFor: #ceStoreCheck: asSymbol
called: 'ceStoreCheckTrampoline'
arg: ReceiverResultReg
result: cogit returnRegForStoreCheck!
Item was changed:
----- Method: CogThreadManager>>startThreadForThreadInfo: (in category 'scheduling') -----
startThreadForThreadInfo: vmThread
<var: #vmThread type: #'CogVMThread *'>
<inline: false>
self assert: vmThread state isNil.
vmThread state: CTMInitializing.
"self cCode: ''
inSmalltalk: [coInterpreter transcript
cr;
nextPutAll: 'starting VM thread ';
print: vmThread index;
flush.
(thisContext home stackOfSize: 10) do:
[:ctxt|
coInterpreter transcript cr; print: ctxt; flush]]."
+ (self ioNewOS: #startVMThread: Thread: vmThread) = 0 ifTrue:
- (self ioNewOS: #startVMThread: asSymbol Thread: vmThread) = 0 ifTrue:
[self ioTransferTimeslice.
^true].
memoryIsScarce := true.
"self cCode: [coInterpreter print: 'ERVT failed to spawn so memory is scarce'; cr]"
^false!
Item was changed:
----- Method: CogVMSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') -----
ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength
"Load and return the requested function from a module"
| pluginString functionString |
pluginString := String new: moduleLength.
1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)].
functionString := String new: functionLength.
1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)].
- functionString := functionString asSymbol.
^self ioLoadFunction: functionString From: pluginString!
Item was changed:
----- Method: CogVMSimulator>>rewriteMethodCacheEntryForExternalPrimitiveToFunction: (in category 'method lookup cache') -----
rewriteMethodCacheEntryForExternalPrimitiveToFunction: localPrimAddress
super rewriteMethodCacheEntryForExternalPrimitiveToFunction:
(self mapFunctionToAddress: (localPrimAddress = 0
+ ifTrue: [#primitiveFail]
- ifTrue: [#primitiveFail asSymbol]
ifFalse: [localPrimAddress])).
"Hack; the super call will rewrite the entry to the address of the function.
So (when simulating) undo the damage and put back the functionPointer"
(methodCache at: lastMethodCacheProbeWrite + MethodCacheMethod) = newMethod ifTrue:
[methodCache
at: lastMethodCacheProbeWrite + MethodCachePrimFunction
put: (self cCoerce: localPrimAddress to: #long)]!
Item was changed:
----- Method: Cogit>>allMachineCodeObjectReferencesValid (in category 'garbage collection') -----
allMachineCodeObjectReferencesValid
"Check that all methods have valid selectors, and that all linked sends are to valid targets and have valid cache tags"
| ok cogMethod |
<var: #cogMethod type: #'CogMethod *'>
ok := true.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType ~= CMFree ifTrue:
[(self asserta: (objectRepresentation checkValidObjectReference: cogMethod selector)) ifFalse:
[ok := false].
(self asserta: (self cogMethodDoesntLookKosher: cogMethod) = 0) ifFalse:
[ok := false]].
(cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]) ifTrue:
[(self asserta: ((self mapFor: cogMethod
+ performUntil: #checkIfValidObjectRefAndTarget:pc:cogMethod:
- performUntil: #checkIfValidObjectRefAndTarget:pc:cogMethod: asSymbol
arg: cogMethod asInteger) = 0)) ifFalse:
[ok := false]].
cogMethod cmType = CMClosedPIC ifTrue:
[(self asserta: (self noTargetsFreeInClosedPIC: cogMethod)) ifFalse:
[ok := false]].
cogMethod := methodZone methodAfter: cogMethod].
^ok!
Item was changed:
----- Method: Cogit>>bytecodePCFor:startBcpc:in: (in category 'method map') -----
bytecodePCFor: mcpc startBcpc: startbcpc in: cogMethod
"Answer the zero-relative bytecode pc matching the machine code pc argument in
cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogBlockMethod *'>
^self
mapFor: cogMethod
bcpc: startbcpc
+ performUntil: #findMcpc:Bcpc:MatchingMcpc:
- performUntil: #findMcpc:Bcpc:MatchingMcpc: asSymbol
arg: (self cCoerceSimple: mcpc to: #'void *')!
Item was changed:
----- Method: Cogit>>checkIntegrityOfObjectReferencesInCode: (in category 'debugging') -----
checkIntegrityOfObjectReferencesInCode: fullGCFlag
<api>
"Answer if all references to objects in machine-code are valid."
| cogMethod ok count |
<var: #cogMethod type: #'CogMethod *'>
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
ok := true.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType ~= CMFree ifTrue:
[cogMethod cmRefersToYoung ifTrue:
[(count := methodZone occurrencesInYoungReferrers: cogMethod) ~= 1 ifTrue:
[self print: 'young referrer CM '; printHex: cogMethod asInteger.
count = 0
ifTrue: [self print: ' is not in youngReferrers'; cr]
ifFalse: [self print: ' is in youngReferrers '; printNum: count; print: ' times!!'; cr].
ok := false]].
(objectRepresentation checkValidObjectReference: cogMethod selector) ifFalse:
[self print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' selector'; cr.
ok := false].
cogMethod cmType = CMMethod
ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
(objectRepresentation checkValidObjectReference: cogMethod methodObject) ifFalse:
[self print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr.
ok := false].
(self mapFor: cogMethod
+ performUntil: #checkIfValidObjectRef:pc:cogMethod:
- performUntil: #checkIfValidObjectRef:pc:cogMethod: asSymbol
arg: cogMethod asInteger) ~= 0
ifTrue: [ok := false].
fullGCFlag ifFalse:
[(((objectMemory isYoung: cogMethod methodObject)
or: [objectMemory isYoung: cogMethod selector])
and: [cogMethod cmRefersToYoung not]) ifTrue:
[self print: 'CM '; printHex: cogMethod asInteger; print: ' refers to young but not marked as such'; cr.
ok := false]]]
ifFalse:
[cogMethod cmType = CMClosedPIC
ifTrue:
[(self checkValidObjectReferencesInClosedPIC: cogMethod) ifFalse:
[ok := false]]
ifFalse:
[cogMethod cmType = CMOpenPIC
ifTrue:
[(self mapFor: cogMethod
+ performUntil: #checkIfValidObjectRef:pc:cogMethod:
- performUntil: #checkIfValidObjectRef:pc:cogMethod: asSymbol
arg: cogMethod asInteger) ~= 0
ifTrue: [ok := false]]]]].
cogMethod := methodZone methodAfter: cogMethod].
^ok!
Item was changed:
----- Method: Cogit>>disassembleMethod:on: (in category 'disassembly') -----
disassembleMethod: surrogateOrAddress on: aStream
<doNotGenerate>
| cogMethod mapEntries codeRanges |
cogMethod := surrogateOrAddress isInteger
ifTrue: [self cogMethodSurrogateAt: surrogateOrAddress]
ifFalse: [surrogateOrAddress].
cogMethod cmType = CMBlock ifTrue:
[^self disassembleMethod: cogMethod cmHomeMethod on: aStream].
self printMethodHeader: cogMethod on: aStream.
(mapEntries := Dictionary new)
at: cogMethod asInteger + cmEntryOffset put: 'entry'.
cogMethod cmType = CMMethod ifTrue:
[mapEntries at: cogMethod asInteger + cmNoCheckEntryOffset put: 'noCheckEntry'.
self cppIf: NewspeakVM
ifTrue: [mapEntries at: cogMethod asInteger + dynSuperEntryAlignment put: 'dynSuperEntry']].
cogMethod cmType = CMClosedPIC ifTrue:
[mapEntries at: cogMethod asInteger + firstCPICCaseOffset put: 'ClosedPICCase0'.
1 to: numPICCases - 1 do:
[:i|
mapEntries
at: cogMethod asInteger + firstCPICCaseOffset + (i * cPICCaseSize)
put: 'ClosedPICCase', i printString]].
self mapFor: cogMethod
+ performUntil: #collectMapEntry:address:into:
- performUntil: #collectMapEntry:address:into: asSymbol
arg: mapEntries.
"This would all be far more elegant and simple if we used blocks.
But there are no blocks in C and the basic enumerators here need
to be used in the real VM. Apologies."
(codeRanges := self codeRangesFor: cogMethod) do:
[:range|
(cogMethod cmType = CMMethod) ifTrue:
[mapEntries keysAndValuesDo:
[:mcpc :label| | bcpc |
((range includes: mcpc)
and: [#(IsSendCall HasBytecodePC) includes: label]) ifTrue:
[bcpc := self bytecodePCFor: mcpc startBcpc: range startpc in: range cogMethod.
bcpc ~= 0 ifTrue:
[mapEntries at: mcpc put: label, ' bc ', bcpc printString, '/', (bcpc + 1) printString]]]].
(cogMethod blockEntryOffset ~= 0
and: [range first = (cogMethod blockEntryOffset + cogMethod asInteger)])
ifTrue:
[aStream nextPutAll: 'blockEntry:'; cr.
self blockDispatchFor: cogMethod
perform: #disassemble:from:to:arg:
arg: aStream]
ifFalse:
[range first > (cogMethod address + cmNoCheckEntryOffset) ifTrue:
[self printMethodHeader: range cogMethod
on: aStream].
self disassembleFrom: range first to: range last labels: mapEntries on: aStream]].
aStream nextPutAll: 'startpc: '; print: codeRanges first startpc; cr.
(cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]) ifTrue:
[[self mapFor: cogMethod
performUntil: #printMapEntry:mcpc:args:
arg: { aStream. codeRanges. cogMethod }]
on: AssertionFailure
do: [:ex|
ex primitiveChangeClassTo: ResumableVMError basicNew. ":) :) :)"
ex resume: nil]].
^cogMethod!
Item was changed:
----- Method: Cogit>>findEnclosingMethodFor:inHomeMethod: (in category 'method map') -----
findEnclosingMethodFor: mcpc inHomeMethod: cogMethod
<var: #cogMethod type: #'CogMethod *'>
<returnTypeC: #'CogBlockMethod *'>
<api>
"Find the CMMethod or CMBlock that encloses mcpc.
If the method contains blocks then, because block dispatch is not in order,
enumerate the block dispatch and find the nearest preceeding entry."
self assert: cogMethod cmType = CMMethod.
cogMethod blockEntryOffset = 0 ifTrue:
[^self cCoerceSimple: cogMethod to: #'CogBlockMethod *'].
maxMethodBefore := self cCoerceSimple: cogMethod to: #'CogBlockMethod *'.
+ self blockDispatchTargetsFor: cogMethod perform: #findMinAndMaxMethodsPC:around: arg: mcpc.
- self blockDispatchTargetsFor: cogMethod perform: #findMinAndMaxMethodsPC:around: asSymbol arg: mcpc.
^maxMethodBefore!
Item was changed:
----- Method: Cogit>>findMethodForStartBcpc:inHomeMethod: (in category 'method map') -----
findMethodForStartBcpc: startbcpc inHomeMethod: cogMethod
<api>
<var: #cogMethod type: #'CogMethod *'>
<returnTypeC: #'CogBlockMethod *'>
"Find the CMMethod or CMBlock that has zero-relative startbcpc as its first bytecode pc.
As this is for cannot resume processing and/or conversion to machine-code on backward
branch, it doesn't have to be fast. Enumerate block returns and map to bytecode pcs."
self assert: cogMethod cmType = CMMethod.
startbcpc = (coInterpreter startPCOfMethodHeader: cogMethod methodHeader) ifTrue:
[^self cCoerceSimple: cogMethod to: #'CogBlockMethod *'].
self assert: cogMethod blockEntryOffset ~= 0.
^self cCoerceSimple: (self blockDispatchTargetsFor: cogMethod
+ perform: #findBlockMethodWithEntry:startBcpc:
- perform: #findBlockMethodWithEntry:startBcpc: asSymbol
arg: startbcpc)
to: #'CogBlockMethod *'!
Item was changed:
----- Method: Cogit>>genActiveContextTrampoline (in category 'initialization') -----
genActiveContextTrampoline
"Short-circuit the interpreter call if a frame is already married."
| jumpSingle |
<var: #jumpSingle type: #'AbstractInstruction *'>
opcodeIndex := 0.
self MoveMw: FoxMethod r: FPReg R: TempReg.
self AndCq: MFMethodFlagHasContextFlag R: TempReg.
jumpSingle := self JumpZero: 0.
self MoveMw: FoxThisContext r: FPReg R: ReceiverResultReg.
self RetN: 0.
jumpSingle jmpTarget: self Label.
+ ^self genTrampolineFor: #ceActiveContext
- ^self genTrampolineFor: #ceActiveContext asSymbol
called: 'ceActiveContextTrampoline'
callJumpBar: true
numArgs: 0
arg: nil
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: ReceiverResultReg
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>genCheckForInterruptsTrampoline (in category 'initialization') -----
genCheckForInterruptsTrampoline
opcodeIndex := 0.
self PopR: TempReg. "instruction pointer"
self MoveR: TempReg Aw: coInterpreter instructionPointerAddress.
+ ^self genTrampolineFor: #ceCheckForInterrupts
- ^self genTrampolineFor: #ceCheckForInterrupts asSymbol
called: 'ceCheckForInterruptsTrampoline'
callJumpBar: true
numArgs: 0
arg: nil
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>genInnerPICAbortTrampoline: (in category 'initialization') -----
genInnerPICAbortTrampoline: name
"Generate the abort for a PIC. This abort performs either a call of
ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged
target or a call of ceMNUFromPICMNUMethod:receiver: to handle an
MNU dispatch in a closed PIC. It distinguishes the two by testing
ClassReg. If the register is zero then this is an MNU."
<var: #name type: #'char *'>
| jumpMNUCase |
<var: #jumpMNUCase type: #'AbstractInstruction *'>
self CmpCq: 0 R: ClassReg.
jumpMNUCase := self JumpZero: 0.
+ self compileTrampolineFor: #ceInterpretMethodFromPIC:receiver:
- self compileTrampolineFor: #ceInterpretMethodFromPIC:receiver: asSymbol
callJumpBar: true
numArgs: 2
arg: SendNumArgsReg
arg: ReceiverResultReg
arg: nil
arg: nil
saveRegs: false
resultReg: nil.
jumpMNUCase jmpTarget: self Label.
+ ^self genTrampolineFor: #ceMNUFromPICMNUMethod:receiver:
- ^self genTrampolineFor: #ceMNUFromPICMNUMethod:receiver: asSymbol
called: name
callJumpBar: true
numArgs: 2
arg: SendNumArgsReg
arg: ReceiverResultReg
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>genMethodAbortTrampoline (in category 'initialization') -----
genMethodAbortTrampoline
"Generate the abort for a method. This abort performs either a call of ceSICMiss:
to handle a single-in-line cache miss or a call of ceStackOverflow: to handle a
stack overflow. It distinguishes the two by testing ResultReceiverReg. If the
register is zero then this is a stack-overflow because a) the receiver has already
been pushed and so can be set to zero before calling the abort, and b) the
receiver must always contain an object (and hence be non-zero) on SIC miss."
| jumpSICMiss |
<var: #jumpSICMiss type: #'AbstractInstruction *'>
opcodeIndex := 0.
self CmpCq: 0 R: ReceiverResultReg.
jumpSICMiss := self JumpNonZero: 0.
+ self compileTrampolineFor: #ceStackOverflow:
- self compileTrampolineFor: #ceStackOverflow: asSymbol
callJumpBar: true
numArgs: 1
arg: SendNumArgsReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil.
jumpSICMiss jmpTarget: self Label.
+ ^self genTrampolineFor: #ceSICMiss:
- ^self genTrampolineFor: #ceSICMiss: asSymbol
called: 'ceMethodAbort'
callJumpBar: true
numArgs: 1
arg: ReceiverResultReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>genNonLocalReturnTrampoline (in category 'initialization') -----
genNonLocalReturnTrampoline
opcodeIndex := 0.
self PopR: TempReg. "instruction pointer"
self MoveR: TempReg Aw: coInterpreter instructionPointerAddress.
+ ^self genTrampolineFor: #ceNonLocalReturn:
- ^self genTrampolineFor: #ceNonLocalReturn: asSymbol
called: 'ceNonLocalReturnTrampoline'
callJumpBar: true
numArgs: 1
arg: ReceiverResultReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>generateEnilopmarts (in category 'initialization') -----
generateEnilopmarts
"Enilopmarts transfer control from C into machine code (backwards trampolines)."
self cppIf: Debug
ifTrue:
[realCEEnterCogCodePopReceiverReg :=
self genEnilopmartFor: ReceiverResultReg
called: 'realCEEnterCogCodePopReceiverReg'.
+ ceEnterCogCodePopReceiverReg := #enterCogCodePopReceiver.
- ceEnterCogCodePopReceiverReg := #enterCogCodePopReceiver asSymbol.
realCEEnterCogCodePopReceiverAndClassRegs :=
self genEnilopmartFor: ReceiverResultReg
and: ClassReg
called: 'realCEEnterCogCodePopReceiverAndClassRegs'.
+ ceEnterCogCodePopReceiverAndClassRegs := #enterCogCodePopReceiverAndClassRegs]
- ceEnterCogCodePopReceiverAndClassRegs := #enterCogCodePopReceiverAndClassRegs asSymbol]
ifFalse:
[ceEnterCogCodePopReceiverReg := self genEnilopmartFor: ReceiverResultReg
called: 'ceEnterCogCodePopReceiverReg'.
ceEnterCogCodePopReceiverAndClassRegs :=
self genEnilopmartFor: ReceiverResultReg
and: ClassReg
called: 'ceEnterCogCodePopReceiverAndClassRegs'].
self genPrimReturnEnterCogCodeEnilopmart: false.
cePrimReturnEnterCogCode := methodZoneBase.
self outputInstructionsForGeneratedRuntimeAt: cePrimReturnEnterCogCode.
self recordGeneratedRunTime: 'cePrimReturnEnterCogCode' address: cePrimReturnEnterCogCode.
self genPrimReturnEnterCogCodeEnilopmart: true.
cePrimReturnEnterCogCodeProfiling := methodZoneBase.
self outputInstructionsForGeneratedRuntimeAt: cePrimReturnEnterCogCodeProfiling.
self recordGeneratedRunTime: 'cePrimReturnEnterCogCodeProfiling' address: cePrimReturnEnterCogCodeProfiling!
Item was changed:
----- Method: Cogit>>generateNewspeakRuntime (in category 'initialization') -----
generateNewspeakRuntime
<option: #NewspeakVM>
| jumpMiss jumpItsTheReceiverStupid |
<var: #jumpMiss type: #'AbstractInstruction *'>
<var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'>
"Generate the non-send runtime support for Newspeak, explicit outer and implicit receiver.
The dynamic frequency of explicit outer is so low we merely call an interpreter routine."
+ ceExplicitReceiverTrampoline := self genTrampolineFor: #ceExplicitReceiverAt:
- ceExplicitReceiverTrampoline := self genTrampolineFor: #ceExplicitReceiverAt: asSymbol
called: 'ceExplicitReceiverTrampoline'
arg: SendNumArgsReg
result: ReceiverResultReg.
"Cached push implicit receiver implementation. Caller looks like
mov selector, ClassReg
call ceImplicitReceiver
br continue
Lclass: .word
Lmixin:: .word
continue:
If class matches class of receiver then mixin contains either 0 or the implicit receiver.
If 0, answer the actual receiver, otherwise the mixin.
Generate the class fetch and cache probe inline for speed. Smashes Arg0Reg and caller-saved regs."
opcodeIndex := 0.
self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg.
objectRepresentation genGetClassObjectOf: ReceiverResultReg into: ClassReg scratchReg: TempReg.
self MoveMw: 0 r: SPReg R: TempReg.
self MoveMw: backEnd jumpShortByteSize r: TempReg R: Arg0Reg.
self CmpR: ClassReg R: Arg0Reg.
jumpMiss := self JumpNonZero: 0.
self MoveMw: backEnd jumpShortByteSize + BytesPerOop r: TempReg R: ClassReg.
self CmpCq: 0 R: ClassReg.
jumpItsTheReceiverStupid := self JumpZero: 0.
self MoveR: ClassReg R: ReceiverResultReg.
jumpItsTheReceiverStupid jmpTarget: (self RetN: 0).
jumpMiss jmpTarget: self Label.
ceImplicitReceiverTrampoline := self
+ genTrampolineFor: #ceImplicitReceiverFor:receiver:class:
- genTrampolineFor: #ceImplicitReceiverFor:receiver:class: asSymbol
called: 'ceImplicitReceiverTrampoline'
callJumpBar: true
numArgs: 3
arg: SendNumArgsReg
arg: ReceiverResultReg
arg: ClassReg
arg: nil
saveRegs: false
resultReg: ReceiverResultReg
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>generateRunTimeTrampolines (in category 'initialization') -----
generateRunTimeTrampolines
"Generate the run-time entries at the base of the native code zone and update the base."
ceSendMustBeBooleanAddFalseTrampoline := self genMustBeBooleanTrampolineFor: objectMemory falseObject
called: 'ceSendMustBeBooleanAddFalseTrampoline'.
ceSendMustBeBooleanAddTrueTrampoline := self genMustBeBooleanTrampolineFor: objectMemory trueObject
called: 'ceSendMustBeBooleanAddTrueTrampoline'.
+ ceClosureCopyTrampoline := self genTrampolineFor: #ceClosureCopyDescriptor:
- "Slang needs these apparently superfluous asSymbol sends."
- ceClosureCopyTrampoline := self genTrampolineFor: #ceClosureCopyDescriptor: asSymbol
called: 'ceClosureCopyTrampoline'
arg: SendNumArgsReg
result: ReceiverResultReg.
ceActiveContextTrampoline := self genActiveContextTrampoline.
ceNonLocalReturnTrampoline := self genNonLocalReturnTrampoline.
+ ceBaseFrameReturnTrampoline := self genTrampolineFor: #ceBaseFrameReturn:
- ceBaseFrameReturnTrampoline := self genTrampolineFor: #ceBaseFrameReturn: asSymbol
called: 'ceBaseFrameReturnTrampoline'
arg: ReceiverResultReg.
+ ceCreateNewArrayTrampoline := self genTrampolineFor: #ceNewArraySlotSize:
- ceCreateNewArrayTrampoline := self genTrampolineFor: #ceNewArraySlotSize: asSymbol
called: 'ceCreateNewArrayTrampoline'
arg: SendNumArgsReg
result: ReceiverResultReg.
ceCheckForInterruptTrampoline := self genCheckForInterruptsTrampoline.
ceStoreCheckTrampoline := objectRepresentation genStoreCheckTrampoline.
+ ceFetchContextInstVarTrampoline := self genTrampolineFor: #ceContext:instVar:
- ceFetchContextInstVarTrampoline := self genTrampolineFor: #ceContext:instVar: asSymbol
called: 'ceFetchContextInstVarTrampoline'
arg: ReceiverResultReg
arg: SendNumArgsReg
result: SendNumArgsReg.
+ ceStoreContextInstVarTrampoline := self genTrampolineFor: #ceContext:instVar:value:
- ceStoreContextInstVarTrampoline := self genTrampolineFor: #ceContext:instVar:value: asSymbol
called: 'ceStoreContextInstVarTrampoline'
arg: ReceiverResultReg
arg: SendNumArgsReg
arg: ClassReg
result: ReceiverResultReg. "to keep ReceiverResultReg live."
+ cePositive32BitIntegerTrampoline := self genTrampolineFor: #cePositive32BitIntegerFor:
- cePositive32BitIntegerTrampoline := self genTrampolineFor: #cePositive32BitIntegerFor: asSymbol
called: 'cePositive32BitIntegerTrampoline'
arg: ReceiverResultReg
result: TempReg.
+ ceReturnToInterpreterTrampoline := self genTrampolineFor: #ceReturnToInterpreter:
- ceReturnToInterpreterTrampoline := self genTrampolineFor: #ceReturnToInterpreter: asSymbol
called: 'ceReturnToInterpreterTrampoline'
arg: ReceiverResultReg.
+ ceCannotResumeTrampoline := self genTrampolineFor: #ceCannotResume
- ceCannotResumeTrampoline := self genTrampolineFor: #ceCannotResume asSymbol
called: 'ceCannotResumeTrampoline'!
Item was changed:
----- Method: Cogit>>generateSendTrampolines (in category 'initialization') -----
generateSendTrampolines
- "Slang needs these apparently superfluous asSymbol sends."
0 to: NumSendTrampolines - 2 do:
[:numArgs|
sendTrampolines
at: numArgs
+ put: (self genTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genTrampolineFor: #ceSend:super:to:numArgs: asSymbol
called: (self trampolineName: 'ceSend' numArgs: numArgs)
arg: ClassReg
arg: 0
arg: ReceiverResultReg
arg: numArgs)].
sendTrampolines
at: NumSendTrampolines - 1
+ put: (self genTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genTrampolineFor: #ceSend:super:to:numArgs: asSymbol
called: (self trampolineName: 'ceSend' numArgs: -1)
arg: ClassReg
arg: 0
arg: ReceiverResultReg
arg: SendNumArgsReg).
self cppIf: NewspeakVM
ifTrue:
[0 to: NumSendTrampolines - 2 do:
[:numArgs|
dynamicSuperSendTrampolines
at: numArgs
+ put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs:
- put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs: asSymbol
called: (self trampolineName: 'ceDynSuperSend' numArgs: numArgs)
arg: ClassReg
arg: ReceiverResultReg
arg: numArgs)].
dynamicSuperSendTrampolines
at: NumSendTrampolines - 1
+ put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs:
- put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs: asSymbol
called: (self trampolineName: 'ceDynSuperSend' numArgs: -1)
arg: ClassReg
arg: ReceiverResultReg
arg: SendNumArgsReg)].
0 to: NumSendTrampolines - 2 do:
[:numArgs|
superSendTrampolines
at: numArgs
+ put: (self genTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genTrampolineFor: #ceSend:super:to:numArgs: asSymbol
called: (self trampolineName: 'ceSuperSend' numArgs: numArgs)
arg: ClassReg
arg: 1
arg: ReceiverResultReg
arg: numArgs)].
superSendTrampolines
at: NumSendTrampolines - 1
+ put: (self genTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genTrampolineFor: #ceSend:super:to:numArgs: asSymbol
called: (self trampolineName: 'ceSuperSend' numArgs: -1)
arg: ClassReg
arg: 1
arg: ReceiverResultReg
arg: SendNumArgsReg).
firstSend := sendTrampolines at: 0.
lastSend := superSendTrampolines at: NumSendTrampolines - 1!
Item was changed:
----- Method: Cogit>>generateStackPointerCapture (in category 'initialization') -----
generateStackPointerCapture
"Generate a routine ceCaptureCStackPointers that will capture the C stack pointer,
and, if it is in use, the C frame pointer. These are used in trampolines to call
run-time routines in the interpreter from machine-code."
| oldMethodZoneBase oldTrampolineTableIndex |
self assertCStackWellAligned.
oldMethodZoneBase := methodZoneBase.
oldTrampolineTableIndex := trampolineTableIndex.
self generateCaptureCStackPointers: true.
+ self perform: #ceCaptureCStackPointers.
- self perform: #ceCaptureCStackPointers asSymbol.
(cFramePointerInUse := self isCFramePointerInUse) ifFalse:
[methodZoneBase := oldMethodZoneBase.
trampolineTableIndex := oldTrampolineTableIndex.
self generateCaptureCStackPointers: false]!
Item was changed:
----- Method: Cogit>>mapObjectReferencesInMachineCodeForBecome (in category 'garbage collection') -----
mapObjectReferencesInMachineCodeForBecome
"Update all references to objects in machine code for a become.
Unlike incrementalGC or fullGC a method that does not refer to young may
refer to young as a result of the become operation. Unlike incrementalGC
or fullGC the reference from a Cog method to its methodObject *must not*
change since the two are two halves of the same object."
| cogMethod hasYoungObj hasYoungObjPtr freedPIC |
<var: #cogMethod type: #'CogMethod *'>
hasYoungObj := false.
hasYoungObjPtr := self cCode: [(self addressOf: hasYoungObj) asInteger]
inSmalltalk: [CPluggableAccessor new
setObject: nil;
atBlock: [:obj :idx| hasYoungObj]
atPutBlock: [:obj :idx :val| hasYoungObj := val]].
codeModified := freedPIC := false.
self mapObjectReferencesInGeneratedRuntime.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[self assert: hasYoungObj not.
cogMethod cmType ~= CMFree ifTrue:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod selector: (objectRepresentation remapOop: cogMethod selector)..
cogMethod cmType = CMClosedPIC
ifTrue:
[((objectMemory isYoung: cogMethod selector)
or: [self mapObjectReferencesInClosedPIC: cogMethod]) ifTrue:
[freedPIC := true.
methodZone freeMethod: cogMethod]]
ifFalse:
[(objectMemory isYoung: cogMethod selector) ifTrue:
[hasYoungObj := true].
cogMethod cmType = CMMethod ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
self assert: ((coInterpreter rawHeaderOf: cogMethod methodObject) = cogMethod asInteger
or: [(self noAssertMethodClassAssociationOf: cogMethod methodObject)
= objectMemory nilObject]).
(objectMemory isYoung: cogMethod methodObject) ifTrue:
[hasYoungObj := true]].
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#remapNSIfObjectRef:pc:hasYoung:]
+ ifFalse: [#remapIfObjectRef:pc:hasYoung:])
- ifTrue: [#remapNSIfObjectRef:pc:hasYoung: asSymbol]
- ifFalse: [#remapIfObjectRef:pc:hasYoung: asSymbol])
arg: hasYoungObjPtr.
hasYoungObj
ifTrue:
[cogMethod cmRefersToYoung ifFalse:
[cogMethod cmRefersToYoung: true.
methodZone addToYoungReferrers: cogMethod].
hasYoungObj := false]
ifFalse: [cogMethod cmRefersToYoung: false]]].
cogMethod := methodZone methodAfter: cogMethod].
methodZone pruneYoungReferrers.
freedPIC ifTrue:
[self unlinkSendsToFree.
codeModified := true].
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
[processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>mapObjectReferencesInMachineCodeForFullGC (in category 'garbage collection') -----
mapObjectReferencesInMachineCodeForFullGC
"Update all references to objects in machine code for a full gc. Since
the current (New)ObjectMemory GC makes everything old in a full GC
a method not referring to young will not refer to young afterwards"
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
codeModified := false.
self mapObjectReferencesInGeneratedRuntime.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType ~= CMFree ifTrue:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod selector: (objectRepresentation remapOop: cogMethod selector).
cogMethod cmType = CMClosedPIC
ifTrue:
[self assert: cogMethod cmRefersToYoung not.
self mapObjectReferencesInClosedPIC: cogMethod]
ifFalse:
[cogMethod cmType = CMMethod ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject)].
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#remapNSIfObjectRef:pc:hasYoung:]
+ ifFalse: [#remapIfObjectRef:pc:hasYoung:])
- ifTrue: [#remapNSIfObjectRef:pc:hasYoung: asSymbol]
- ifFalse: [#remapIfObjectRef:pc:hasYoung: asSymbol])
arg: 0.
(cogMethod cmRefersToYoung
and: [objectRepresentation allYoungObjectsAgeInFullGC]) ifTrue:
[cogMethod cmRefersToYoung: false]]].
cogMethod := methodZone methodAfter: cogMethod].
methodZone pruneYoungReferrers.
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
[processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>mapObjectReferencesInMachineCodeForIncrementalGC (in category 'garbage collection') -----
mapObjectReferencesInMachineCodeForIncrementalGC
"Update all references to objects in machine code for an incremental gc.
Avoid scanning all code by using the youngReferrers list. In an incremental
GC a method referring to young may no longer refer to young, but a method
not referring to young cannot and will not refer to young afterwards."
| pointer cogMethod hasYoungObj hasYoungObjPtr |
<var: #cogMethod type: #'CogMethod *'>
hasYoungObj := false.
hasYoungObjPtr := self cCode: [(self addressOf: hasYoungObj) asInteger]
inSmalltalk: [CPluggableAccessor new
setObject: nil;
atBlock: [:obj :idx| hasYoungObj]
atPutBlock: [:obj :idx :val| hasYoungObj := val]].
codeModified := false.
pointer := methodZone youngReferrers.
[pointer < methodZone zoneEnd] whileTrue:
[self assert: hasYoungObj not.
cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'.
cogMethod cmType = CMFree
ifTrue: [self assert: cogMethod cmRefersToYoung not]
ifFalse:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod cmRefersToYoung ifTrue:
[self assert: (cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]).
cogMethod selector: (objectRepresentation remapOop: cogMethod selector).
(objectMemory isYoung: cogMethod selector) ifTrue:
[hasYoungObj := true].
cogMethod cmType = CMMethod ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject).
(objectMemory isYoung: cogMethod methodObject) ifTrue:
[hasYoungObj := true]].
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#remapNSIfObjectRef:pc:hasYoung:]
+ ifFalse: [#remapIfObjectRef:pc:hasYoung:])
- ifTrue: [#remapNSIfObjectRef:pc:hasYoung: asSymbol]
- ifFalse: [#remapIfObjectRef:pc:hasYoung: asSymbol])
arg: hasYoungObjPtr.
hasYoungObj
ifTrue: [hasYoungObj := false]
ifFalse: [cogMethod cmRefersToYoung: false]]].
pointer := pointer + BytesPerWord].
methodZone pruneYoungReferrers.
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
[processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>markLiteralsAndUnlinkUnmarkedSendsIn: (in category 'garbage collection') -----
markLiteralsAndUnlinkUnmarkedSendsIn: cogMethod
"Unlink sends that have unmarked classes in inline caches or freed/freeable targets.
Nil-out inline caches linked to open PICs.
Assert that any selectors are marked. We can do this since
this is only run on marked methods and thus any selectors they
reference should already be marked."
<var: #cogMethod type: #'CogMethod *'>
<inline: true>
self assert: cogMethod cmType = CMMethod.
self assert: (objectMemory isMarked: cogMethod methodObject).
objectRepresentation markAndTraceLiteral: cogMethod selector.
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method:]
+ ifFalse: [#markLiteralsAndUnlinkIfUnmarkedSend:pc:method:])
- ifTrue: [#markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method: asSymbol]
- ifFalse: [#markLiteralsAndUnlinkIfUnmarkedSend:pc:method: asSymbol])
arg: cogMethod asInteger!
Item was changed:
----- Method: Cogit>>markMethodAndReferents: (in category 'jit - api') -----
markMethodAndReferents: aCogMethod
<api>
<var: #aCogMethod type: #'CogBlockMethod *'>
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
self assert: (aCogMethod cmType = CMMethod
or: [aCogMethod cmType = CMBlock]).
cogMethod := aCogMethod cmType = CMMethod
ifTrue: [self cCoerceSimple: aCogMethod to: #'CogMethod *']
ifFalse: [aCogMethod cmHomeMethod].
cogMethod cmUsageCount: CMMaxUsageCount.
self mapFor: cogMethod
+ performUntil: #incrementUsageOfTargetIfLinkedSend:mcpc:ignored:
- performUntil: #incrementUsageOfTargetIfLinkedSend:mcpc:ignored: asSymbol
arg: 0!
Item was changed:
----- Method: Cogit>>markYoungObjectsIn: (in category 'garbage collection') -----
markYoungObjectsIn: cogMethod
"Mark young literals in the method."
<var: #cogMethod type: #'CogMethod *'>
<inline: true>
self assert: (cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]).
(objectMemory isYoung: cogMethod selector) ifTrue:
[objectMemory markAndTrace: cogMethod selector].
(cogMethod cmType = CMMethod
and: [objectMemory isYoung: cogMethod methodObject]) ifTrue:
[objectMemory markAndTrace: cogMethod methodObject].
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#markNSYoungObjects:pc:method:]
+ ifFalse: [#markYoungObjects:pc:method:])
- ifTrue: [#markNSYoungObjects:pc:method: asSymbol]
- ifFalse: [#markYoungObjects:pc:method: asSymbol])
arg: cogMethod asInteger!
Item was changed:
----- Method: Cogit>>mcPCFor:startBcpc:in: (in category 'method map') -----
mcPCFor: bcpc startBcpc: startbcpc in: cogMethod
"Answer the absolute machine code pc matching the zero-relative bytecode pc argument
in cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogBlockMethod *'>
| absPC |
absPC := self
mapFor: cogMethod
bcpc: startbcpc
+ performUntil: #findMcpc:Bcpc:MatchingBcpc:
- performUntil: #findMcpc:Bcpc:MatchingBcpc: asSymbol
arg: (self cCoerceSimple: bcpc to: #'void *').
^absPC ~= 0
ifTrue: [absPC asUnsignedInteger - cogMethod asUnsignedInteger]
ifFalse: [absPC]!
Item was changed:
----- Method: Cogit>>relocateCallsAndSelfReferencesInMethod: (in category 'compaction') -----
relocateCallsAndSelfReferencesInMethod: cogMethod
<var: #cogMethod type: #'CogMethod *'>
| delta |
delta := cogMethod objectHeader signedIntFromLong.
backEnd relocateCallBeforeReturnPC: cogMethod asInteger + missOffset by: delta negated.
self mapFor: cogMethod
+ performUntil: #relocateIfCallOrMethodReference:mcpc:delta:
- performUntil: #relocateIfCallOrMethodReference:mcpc:delta: asSymbol
arg: delta!
Item was changed:
----- Method: Cogit>>scanBlock: (in category 'compile abstract instructions') -----
scanBlock: blockStart
"Scan the block to determine if the block needs a frame or not"
| descriptor pc end stackDelta nExts |
<var: #blockStart type: #'BlockStart *'>
<var: #descriptor type: #'BytecodeDescriptor *'>
needsFrame := false.
methodOrBlockNumArgs := blockStart numArgs.
nExts := 0.
pc := blockStart startpc.
end := blockStart startpc + blockStart span.
stackDelta := 0.
[pc < end] whileTrue:
[byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset.
descriptor := self generatorAt: byte0.
needsFrame ifFalse:
[(descriptor needsFrameFunction isNil
or: [self perform: descriptor needsFrameFunction with: true])
ifTrue: [needsFrame := true]
ifFalse: [stackDelta := stackDelta + descriptor stackDelta]].
pc := self nextBytecodePCFor: descriptor at: pc exts: nExts in: methodObj.
nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]].
needsFrame ifFalse:
[stackDelta < 0 ifTrue:
[self error: 'negative stack delta in block; block contains bogus code or internal error'].
[stackDelta > 0] whileTrue:
[descriptor := self generatorAt: (objectMemory fetchByte: blockStart startpc ofObject: methodObj) + bytecodeSetOffset.
+ descriptor generator ~~ #genPushConstantNilBytecode ifTrue:
- descriptor generator ~~ #genPushConstantNilBytecode asSymbol ifTrue:
[self error: 'frameless block doesn''t start with enough pushNils'].
blockStart
startpc: blockStart startpc + descriptor numBytes;
span: blockStart span - descriptor numBytes.
stackDelta := stackDelta - 1]]!
Item was changed:
----- Method: Cogit>>unlinkAllSends (in category 'jit - api') -----
unlinkAllSends
<api>
"Unlink all sends in cog methods."
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase isNil ifTrue: [^self].
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
+ performUntil: #unlinkIfLinkedSend:pc:ignored:
- performUntil: #unlinkIfLinkedSend:pc:ignored: asSymbol
arg: 0]
ifFalse:
[cogMethod cmType ~= CMFree ifTrue:
[methodZone freeMethod: cogMethod]].
cogMethod := methodZone methodAfter: cogMethod].
"After updating inline caches we need to flush the icache."
processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger!
Item was changed:
----- Method: Cogit>>unlinkSendsOf:isMNUSelector: (in category 'jit - api') -----
unlinkSendsOf: selector isMNUSelector: isMNUSelector
<api>
"Unlink all sends in cog methods."
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase isNil ifTrue: [^self].
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
"First check if any method actually has the selector; if not there can't
be any linked send to it."
[cogMethod < methodZone limitZony
and: [cogMethod selector ~= selector]] whileTrue:
[cogMethod := methodZone methodAfter: cogMethod].
cogMethod >= methodZone limitZony ifTrue:
[^nil].
codeModified := false.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
+ performUntil: #unlinkIfLinkedSend:pc:of:
- performUntil: #unlinkIfLinkedSend:pc:of: asSymbol
arg: selector]
ifFalse:
[(cogMethod cmType ~= CMFree
and: [(isMNUSelector and: [cogMethod cpicHasMNUCase])
or: [cogMethod selector = selector]]) ifTrue:
[methodZone freeMethod: cogMethod]].
cogMethod := methodZone methodAfter: cogMethod].
codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
[processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>unlinkSendsTo:andFreeIf: (in category 'jit - api') -----
unlinkSendsTo: targetMethodObject andFreeIf: freeIfTrue
<api>
"Unlink all sends in cog methods to a particular target method.
If targetMethodObject isn't actually a method (perhaps being
used via invokeAsMethod) then flush all sends since anything
could be affected."
| cogMethod targetMethod freedPIC |
<var: #cogMethod type: #'CogMethod *'>
<var: #targetMethod type: #'CogMethod *'>
((objectMemory isOopCompiledMethod: targetMethodObject)
and: [coInterpreter methodHasCogMethod: targetMethodObject]) ifFalse:
[^self].
targetMethod := coInterpreter cogMethodOf: targetMethodObject.
methodZoneBase isNil ifTrue: [^self].
codeModified := freedPIC := false.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
+ performUntil: #unlinkIfLinkedSend:pc:to:
- performUntil: #unlinkIfLinkedSend:pc:to: asSymbol
arg: targetMethod asInteger]
ifFalse:
[(cogMethod cmType = CMClosedPIC
and: [self cPIC: cogMethod HasTarget: targetMethod]) ifTrue:
[methodZone freeMethod: cogMethod.
freedPIC := true]].
cogMethod := methodZone methodAfter: cogMethod].
freeIfTrue ifTrue: [self freeMethod: targetMethod].
freedPIC
ifTrue: [self unlinkSendsToFree]
ifFalse:
[codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
[processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]]!
Item was changed:
----- Method: Cogit>>unlinkSendsToFree (in category 'garbage collection') -----
unlinkSendsToFree
<api>
"Unlink all sends in cog methods to free methods and/or pics."
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase isNil ifTrue: [^self].
codeModified := false.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
+ performUntil: #unlinkIfLinkedSendToFree:pc:ignored:
- performUntil: #unlinkIfLinkedSendToFree:pc:ignored: asSymbol
arg: 0]
ifFalse:
[cogMethod cmType = CMClosedPIC ifTrue:
[self assert: (self noTargetsFreeInClosedPIC: cogMethod)]].
cogMethod := methodZone methodAfter: cogMethod].
codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
[processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: FilePlugin>>fileRecordSize (in category 'file primitives') -----
fileRecordSize
"Return the size of a Smalltalk file record in bytes."
<static: false>
+ ^self sizeof: #SQFile!
- ^self sizeof: #SQFile asSymbol!
Item was changed:
----- Method: Interpreter>>addNewMethodToCache (in category 'method lookup cache') -----
addNewMethodToCache
"Add the given entry to the method cache.
The policy is as follows:
Look for an empty entry anywhere in the reprobe chain.
If found, install the new entry there.
If not found, then install the new entry at the first probe position
and delete the entries in the rest of the reprobe chain.
This has two useful purposes:
If there is active contention over the first slot, the second
or third will likely be free for reentry after ejection.
Also, flushing is good when reprobe chains are getting full."
| probe hash |
<inline: false>
hash := messageSelector bitXor: lkupClass. "drop low-order zeros from addresses"
(self isOopCompiledMethod: newMethod)
ifTrue:
[primitiveIndex := self primitiveIndexOf: newMethod.
primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: lkupClass]
ifFalse:
+ [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod].
- [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod asSymbol].
primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: lkupClass.
0 to: CacheProbeMax-1 do:
[:p | probe := (hash >> p) bitAnd: MethodCacheMask.
(methodCache at: probe + MethodCacheSelector) = 0 ifTrue:
["Found an empty entry -- use it"
methodCache at: probe + MethodCacheSelector put: messageSelector.
methodCache at: probe + MethodCacheClass put: lkupClass.
methodCache at: probe + MethodCacheMethod put: newMethod.
methodCache at: probe + MethodCachePrim put: primitiveIndex.
methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: 'long').
^ nil]].
"OK, we failed to find an entry -- install at the first slot..."
probe := hash bitAnd: MethodCacheMask. "first probe"
methodCache at: probe + MethodCacheSelector put: messageSelector.
methodCache at: probe + MethodCacheClass put: lkupClass.
methodCache at: probe + MethodCacheMethod put: newMethod.
methodCache at: probe + MethodCachePrim put: primitiveIndex.
methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: 'long').
"...and zap the following entries"
1 to: CacheProbeMax-1 do:
[:p | probe := (hash >> p) bitAnd: MethodCacheMask.
methodCache at: probe + MethodCacheSelector put: 0].
!
Item was changed:
----- Method: Interpreter>>positive64BitValueOf: (in category 'primitive support') -----
positive64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive SmallInteger or an eight-byte LargePositiveInteger."
| sz szsqLong value |
<returnTypeC: #sqLong>
<var: #value type: #sqLong>
(self isIntegerObject: oop) ifTrue:
[value := self integerValueOf: oop.
value < 0 ifTrue: [^self primitiveFail].
^ value].
(self
isClassOfNonImm: oop
equalTo: (self splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex) ifFalse:
[^self primitiveFail].
+ szsqLong := self sizeof: #sqLong.
- szsqLong := self sizeof: #sqLong asSymbol.
sz := self lengthOf: oop.
sz > szsqLong ifTrue:
[^self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (self fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
^value!
Item was changed:
----- Method: Interpreter>>signed64BitValueOf: (in category 'primitive support') -----
signed64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive ST integer or a eight-byte LargeInteger."
| sz value largeClass negative szsqLong |
<inline: false>
<returnTypeC: #sqLong>
<var: #value type: #sqLong>
(self isIntegerObject: oop) ifTrue: [^self cCoerce: (self integerValueOf: oop) to: #sqLong].
largeClass := self fetchClassOfNonInt: oop.
largeClass = self classLargePositiveInteger
ifTrue:[negative := false]
ifFalse:[largeClass = self classLargeNegativeInteger
ifTrue:[negative := true]
ifFalse:[^self primitiveFail]].
+ szsqLong := self sizeof: #sqLong.
- szsqLong := self sizeof: #sqLong asSymbol.
sz := self lengthOf: oop.
sz > szsqLong
ifTrue: [^ self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (self fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
"Filter out values out of range for the signed interpretation such as
16rFFFFFFFF... (positive w/ bit 64 set) and -16rFFFFFFFF... (negative w/ bit
64 set). Since the sign is implicit in the class we require that the high bit of
the magnitude is not set which is a simple test here. Note that we have to
handle the most negative 64-bit value -9223372036854775808 specially."
self cCode: []
inSmalltalk:
[(value anyMask: 16r8000000000000000) ifTrue:
[value := value - 16r10000000000000000]].
value < 0 ifTrue:
[self cCode:
[self assert: (self sizeof: value) == 8.
self assert: (self sizeof: value << 1) == 8].
"Don't fail for -9223372036854775808/-16r8000000000000000.
Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer
overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined."
(negative and: [0 = (self cCode: [value << 1]
inSmalltalk: [value << 1 bitAnd: (1 << 64) - 1])]) ifTrue:
[^value].
^self primitiveFail].
^negative
ifTrue:[0 - value]
ifFalse:[value]!
Item was changed:
----- Method: InterpreterPrimitives>>magnitude64BitValueOf: (in category 'primitive support') -----
magnitude64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive SmallInteger or a eight-byte LargeInteger."
| sz value ok smallIntValue |
<returnTypeC: #usqLong>
<var: #value type: #usqLong>
(objectMemory isIntegerObject: oop) ifTrue:
[smallIntValue := (objectMemory integerValueOf: oop).
smallIntValue < 0 ifTrue: [smallIntValue := 0 - smallIntValue].
^self cCoerce: smallIntValue to: #usqLong].
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
ok
ifFalse:
[ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargeNegativeInteger)
compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
ok ifFalse: [^self primitiveFail]].
sz := objectMemory lengthOf: oop.
+ sz > (self sizeof: #sqLong) ifTrue:
- sz > (self sizeof: #sqLong asSymbol) ifTrue:
[^self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
^value!
Item was changed:
----- Method: InterpreterPrimitives>>positive64BitValueOf: (in category 'primitive support') -----
positive64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive SmallInteger or an eight-byte LargePositiveInteger."
<returnTypeC: #sqLong>
| sz value ok |
<var: #value type: #sqLong>
(objectMemory isIntegerObject: oop) ifTrue:
[value := objectMemory integerValueOf: oop.
value < 0 ifTrue: [^self primitiveFail].
^value].
ok := objectMemory
isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
+ (ok and: [(sz := objectMemory lengthOf: oop) <= (self sizeof: #sqLong)]) ifFalse:
- (ok and: [(sz := objectMemory lengthOf: oop) <= (self sizeof: #sqLong asSymbol)]) ifFalse:
[^self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
^value!
Item was changed:
----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in category 'primitive support') -----
positiveMachineIntegerValueOf: oop
"Answer a value of an integer in address range, i.e up to the size of a machine word.
The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size."
<returnTypeC: #'unsigned long'>
| value bs ok |
(objectMemory isIntegerObject: oop) ifTrue:
[value := objectMemory integerValueOf: oop.
value < 0 ifTrue: [^self primitiveFail].
^value].
ok := objectMemory
isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
+ (ok and: [(bs := objectMemory lengthOf: oop) <= (self sizeof: #'unsigned long')]) ifFalse:
- (ok and: [(bs := objectMemory lengthOf: oop) <= (self sizeof: #'unsigned long' asSymbol)]) ifFalse:
[^self primitiveFail].
+ ((self sizeof: #'unsigned long') = 8
- ((self sizeof: #'unsigned long' asSymbol) = 8
and: [bs > 4]) ifTrue:
[^ (objectMemory fetchByte: 0 ofObject: oop)
+ ((objectMemory fetchByte: 1 ofObject: oop) << 8)
+ ((objectMemory fetchByte: 2 ofObject: oop) << 16)
+ ((objectMemory fetchByte: 3 ofObject: oop) << 24)
+ ((objectMemory fetchByte: 4 ofObject: oop) << 32)
+ ((objectMemory fetchByte: 5 ofObject: oop) << 40)
+ ((objectMemory fetchByte: 6 ofObject: oop) << 48)
+ ((objectMemory fetchByte: 7 ofObject: oop) << 56)].
^ (objectMemory fetchByte: 0 ofObject: oop)
+ ((objectMemory fetchByte: 1 ofObject: oop) << 8)
+ ((objectMemory fetchByte: 2 ofObject: oop) << 16)
+ ((objectMemory fetchByte: 3 ofObject: oop) << 24)!
Item was changed:
----- Method: InterpreterPrimitives>>signed64BitValueOf: (in category 'primitive support') -----
signed64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive SmallInteger or a eight-byte LargeInteger."
| sz value negative ok |
<inline: false>
<returnTypeC: #sqLong>
<var: #value type: #sqLong>
(objectMemory isIntegerObject: oop) ifTrue:
[^self cCoerce: (objectMemory integerValueOf: oop) to: #sqLong].
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
ok
ifTrue: [negative := false]
ifFalse:
[negative := true.
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargeNegativeInteger)
compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
ok ifFalse: [^self primitiveFail]].
sz := objectMemory lengthOf: oop.
+ sz > (self sizeof: #sqLong) ifTrue:
- sz > (self sizeof: #sqLong asSymbol) ifTrue:
[^self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
"Filter out values out of range for the signed interpretation such as
16rFFFFFFFF... (positive w/ bit 64 set) and -16rFFFFFFFF... (negative w/ bit
64 set). Since the sign is implicit in the class we require that the high bit of
the magnitude is not set which is a simple test here. Note that we have to
handle the most negative 64-bit value -9223372036854775808 specially."
self cCode: []
inSmalltalk:
[(value anyMask: 16r8000000000000000) ifTrue:
[value := value - 16r10000000000000000]].
value < 0 ifTrue:
[self cCode:
[self assert: (self sizeof: value) == 8.
self assert: (self sizeof: value << 1) == 8].
"Don't fail for -9223372036854775808/-16r8000000000000000.
Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer
overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined."
(negative and: [0 = (self cCode: [value << 1]
inSmalltalk: [value << 1 bitAnd: (1 << 64) - 1])]) ifTrue:
[^value].
^self primitiveFail].
^negative
ifTrue:[0 - value]
ifFalse:[value]!
Item was changed:
----- Method: InterpreterPrimitives>>signedMachineIntegerValueOf: (in category 'primitive support') -----
signedMachineIntegerValueOf: oop
"Answer a signed value of an integer up to the size of a machine word.
The object may be either a positive SmallInteger or a LargeInteger of size <= word size."
<returnTypeC: #'long'>
| negative ok bs value bits |
<var: #value type: #long>
(objectMemory isIntegerObject: oop) ifTrue:
[^objectMemory integerValueOf: oop].
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
ok
ifTrue: [negative := false]
ifFalse:
[negative := true.
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargeNegativeInteger)
compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
ok ifFalse: [^self primitiveFail]].
+ (bs := objectMemory lengthOf: oop) > (self sizeof: #'unsigned long') ifTrue:
- (bs := objectMemory lengthOf: oop) > (self sizeof: #'unsigned long' asSymbol) ifTrue:
[^self primitiveFail].
+ ((self sizeof: #'unsigned long') = 8
- ((self sizeof: #'unsigned long' asSymbol) = 8
and: [bs > 4])
ifTrue:
[value := (objectMemory fetchByte: 0 ofObject: oop)
+ ((objectMemory fetchByte: 1 ofObject: oop) << 8)
+ ((objectMemory fetchByte: 2 ofObject: oop) << 16)
+ ((objectMemory fetchByte: 3 ofObject: oop) << 24)
+ ((objectMemory fetchByte: 4 ofObject: oop) << 32)
+ ((objectMemory fetchByte: 5 ofObject: oop) << 40)
+ ((objectMemory fetchByte: 6 ofObject: oop) << 48)
+ ((objectMemory fetchByte: 7 ofObject: oop) << 56)]
ifFalse:
[value := (objectMemory fetchByte: 0 ofObject: oop)
+ ((objectMemory fetchByte: 1 ofObject: oop) << 8)
+ ((objectMemory fetchByte: 2 ofObject: oop) << 16)
+ ((objectMemory fetchByte: 3 ofObject: oop) << 24)].
self cCode: []
inSmalltalk:
[bits := (self sizeof: #long) * 8.
(value bitShift: 1 - bits) > 0 ifTrue:
[value := value - (1 bitShift: bits)]].
value < 0 ifTrue:
["Don't fail for -16r80000000[00000000].
Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer
overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined."
(negative and: [0 = (self cCode: [value << 1]
inSmalltalk: [value << 1 bitAnd: (1 << bits) - 1])]) ifTrue:
[^value].
^self primitiveFail].
^negative
ifTrue: [0 - value]
ifFalse: [value]!
Item was changed:
----- Method: InterpreterSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') -----
ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength
"Load and return the requested function from a module"
| pluginString functionString |
pluginString := String new: moduleLength.
1 to: moduleLength do:[:i| pluginString byteAt: i put: (self byteAt: moduleName+i-1)].
functionString := String new: functionLength.
1 to: functionLength do:[:i| functionString byteAt: i put: (self byteAt: functionName+i-1)].
- functionString := functionString asSymbol.
^self ioLoadFunction: functionString From: pluginString!
Item was changed:
----- Method: NewspeakInterpreter>>positiveMachineIntegerValueOf: (in category 'primitive support') -----
positiveMachineIntegerValueOf: oop
"Answer a value of an integer in address range, i.e up to the size of a machine word.
The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size."
<returnTypeC: #'unsigned long'>
| value bs ok |
(self isIntegerObject: oop) ifTrue:
[value := self integerValueOf: oop.
value < 0 ifTrue: [^self primitiveFail].
^value].
ok := self
isClassOfNonImm: oop
equalTo: (self splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
+ (ok and: [(bs := self lengthOf: oop) <= (self sizeof: #'unsigned long')]) ifFalse:
- (ok and: [(bs := self lengthOf: oop) <= (self sizeof: #'unsigned long' asSymbol)]) ifFalse:
[^self primitiveFail].
+ ((self sizeof: #'unsigned long') = 8
- ((self sizeof: #'unsigned long' asSymbol) = 8
and: [bs > 4]) ifTrue:
[^ (self fetchByte: 0 ofObject: oop)
+ ((self fetchByte: 1 ofObject: oop) << 8)
+ ((self fetchByte: 2 ofObject: oop) << 16)
+ ((self fetchByte: 3 ofObject: oop) << 24)
+ ((self fetchByte: 4 ofObject: oop) << 32)
+ ((self fetchByte: 5 ofObject: oop) << 40)
+ ((self fetchByte: 6 ofObject: oop) << 48)
+ ((self fetchByte: 7 ofObject: oop) << 56)].
^ (self fetchByte: 0 ofObject: oop)
+ ((self fetchByte: 1 ofObject: oop) << 8)
+ ((self fetchByte: 2 ofObject: oop) << 16)
+ ((self fetchByte: 3 ofObject: oop) << 24)!
Item was changed:
----- Method: NewspeakInterpreter>>signedMachineIntegerValueOf: (in category 'primitive support') -----
signedMachineIntegerValueOf: oop
"Answer a signed value of an integer up to the size of a machine word.
The object may be either a positive SmallInteger or a LargeInteger of size <= word size."
<returnTypeC: #'long'>
| negative ok bs value bits |
<var: #value type: #long>
(self isIntegerObject: oop) ifTrue:
[^self integerValueOf: oop].
ok := self isClassOfNonImm: oop
equalTo: (self splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
ok
ifTrue: [negative := false]
ifFalse:
[negative := true.
ok := self isClassOfNonImm: oop
equalTo: (self splObj: ClassLargeNegativeInteger)
compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
ok ifFalse: [^self primitiveFail]].
+ (bs := self lengthOf: oop) > (self sizeof: #'unsigned long') ifTrue:
- (bs := self lengthOf: oop) > (self sizeof: #'unsigned long' asSymbol) ifTrue:
[^self primitiveFail].
+ ((self sizeof: #'unsigned long') = 8
- ((self sizeof: #'unsigned long' asSymbol) = 8
and: [bs > 4])
ifTrue:
[value := (self fetchByte: 0 ofObject: oop)
+ ((self fetchByte: 1 ofObject: oop) << 8)
+ ((self fetchByte: 2 ofObject: oop) << 16)
+ ((self fetchByte: 3 ofObject: oop) << 24)
+ ((self fetchByte: 4 ofObject: oop) << 32)
+ ((self fetchByte: 5 ofObject: oop) << 40)
+ ((self fetchByte: 6 ofObject: oop) << 48)
+ ((self fetchByte: 7 ofObject: oop) << 56)]
ifFalse:
[value := (self fetchByte: 0 ofObject: oop)
+ ((self fetchByte: 1 ofObject: oop) << 8)
+ ((self fetchByte: 2 ofObject: oop) << 16)
+ ((self fetchByte: 3 ofObject: oop) << 24)].
self cCode: []
inSmalltalk:
[bits := (self sizeof: #long) * 8.
(value bitShift: 1 - bits) > 0 ifTrue:
[value := value - (1 bitShift: bits)]].
value < 0 ifTrue:
["Don't fail for -16r80000000[00000000].
Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer
overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined."
(negative and: [0 = (self cCode: [value << 1]
inSmalltalk: [value << 1 bitAnd: (1 << bits) - 1])]) ifTrue:
[^value].
^self primitiveFail].
^negative
ifTrue: [0 - value]
ifFalse: [value]!
Item was changed:
----- Method: NewspeakInterpreterSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') -----
ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength
"Load and return the requested function from a module"
| pluginString functionString |
pluginString := String new: moduleLength.
1 to: moduleLength do:[:i| pluginString byteAt: i put: (self byteAt: moduleName+i-1)].
functionString := String new: functionLength.
1 to: functionLength do:[:i| functionString byteAt: i put: (self byteAt: functionName+i-1)].
- functionString := functionString asSymbol.
^self ioLoadFunction: functionString From: pluginString!
Item was changed:
----- Method: SimpleStackBasedCogit>>compileInterpreterPrimitive: (in category 'primitive generators') -----
compileInterpreterPrimitive: primitiveRoutine
"Compile a call to an interpreter primitive. Call the C routine with the
usual stack-switching dance, test the primFailCode and then either
return on success or continue to the method body."
<var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'>
| flags jmp jmpSamplePrim continuePostSamplePrim jmpSampleNonPrim continuePostSampleNonPrim |
<var: #jmp type: #'AbstractInstruction *'>
<var: #jmpSamplePrim type: #'AbstractInstruction *'>
<var: #continuePostSamplePrim type: #'AbstractInstruction *'>
<var: #jmpSampleNonPrim type: #'AbstractInstruction *'>
<var: #continuePostSampleNonPrim type: #'AbstractInstruction *'>
"Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers"
self genExternalizePointersForPrimitiveCall.
"Switch to the C stack."
self genLoadCStackPointersForPrimCall.
flags := coInterpreter primitivePropertyFlags: primitiveIndex.
(flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue:
["Test nextProfileTick for being non-zero and call checkProfileTick if so"
BytesPerWord = 4
ifTrue:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg.
self OrR: TempReg R: ClassReg]
ifFalse:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self CmpCq: 0 R: TempReg].
"If set, jump to record sample call."
jmpSampleNonPrim := self JumpNonZero: 0.
continuePostSampleNonPrim := self Label].
"Clear the primFailCode and set argumentCount"
self MoveCq: 0 R: TempReg.
self MoveR: TempReg Aw: coInterpreter primFailCodeAddress.
methodOrBlockNumArgs ~= 0 ifTrue:
[self MoveCq: methodOrBlockNumArgs R: TempReg].
self MoveR: TempReg Aw: coInterpreter argumentCountAddress.
(flags bitAnd: PrimCallNeedsPrimitiveFunction) ~= 0 ifTrue:
[self MoveCw: primitiveRoutine asInteger R: TempReg.
self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress].
"Old full prim trace is in VMMaker-eem.550 and prior"
self recordPrimTrace ifTrue:
[self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg].
((flags bitAnd: PrimCallNeedsNewMethod+PrimCallMayCallBack) ~= 0) ifTrue:
["The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness."
(flags bitAnd: PrimCallMayCallBack) ~= 0 ifTrue:
[needsFrame := true].
methodLabel addDependent:
(self annotateAbsolutePCRef:
(self MoveCw: methodLabel asInteger R: ClassReg)).
+ self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg.
- self MoveMw: (self offset: CogMethod of: #methodObject asSymbol) r: ClassReg R: TempReg.
self MoveR: TempReg Aw: coInterpreter newMethodAddress].
self PrefetchAw: coInterpreter primFailCodeAddress.
(flags bitAnd: PrimCallMayCallBack) ~= 0
ifTrue: "Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode."
[backEnd genSubstituteReturnAddress:
((flags bitAnd: PrimCallCollectsProfileSamples) ~= 0
ifTrue: [cePrimReturnEnterCogCodeProfiling]
ifFalse: [cePrimReturnEnterCogCode]).
self JumpRT: primitiveRoutine asInteger.
primInvokeLabel := self Label.
jmp := jmpSamplePrim := continuePostSamplePrim := nil]
ifFalse:
["Call the C primitive routine."
self CallRT: primitiveRoutine asInteger.
primInvokeLabel := self Label.
(flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue:
[self assert: (flags bitAnd: PrimCallNeedsNewMethod) ~= 0.
"Test nextProfileTick for being non-zero and call checkProfileTick if so"
BytesPerWord = 4
ifTrue:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg.
self OrR: TempReg R: ClassReg]
ifFalse:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self CmpCq: 0 R: TempReg].
"If set, jump to record sample call."
jmpSamplePrim := self JumpNonZero: 0.
continuePostSamplePrim := self Label].
"Switch back to the Smalltalk stack. Stack better be in either of these two states:
success: stackPointer -> result (was receiver)
arg1
...
argN
return pc
failure: receiver
arg1
...
stackPointer -> argN
return pc
In either case we can push the instructionPointer to reestablish the return pc"
self MoveAw: coInterpreter instructionPointerAddress R: ClassReg.
self genLoadStackPointers.
"Test primitive failure"
self MoveAw: coInterpreter primFailCodeAddress R: TempReg.
self PushR: ClassReg. "Restore return pc"
self flag: 'ask concrete code gen if move sets condition codes?'.
self CmpCq: 0 R: TempReg.
jmp := self JumpNonZero: 0.
"Fetch result from stack"
self MoveMw: BytesPerWord r: SPReg R: ReceiverResultReg.
self flag: 'currently caller pushes result'.
self RetN: BytesPerWord].
(flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue:
["The sample is collected by cePrimReturnEnterCogCode for external calls"
jmpSamplePrim notNil ifTrue:
["Call ceCheckProfileTick: to record sample and then continue."
jmpSamplePrim jmpTarget: self Label.
self assert: (flags bitAnd: PrimCallNeedsNewMethod) ~= 0.
self CallRT: (self cCode: '(unsigned long)ceCheckProfileTick'
inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]).
"reenter the post-primitive call flow"
self Jump: continuePostSamplePrim].
"Null newMethod and call ceCheckProfileTick: to record sample and then continue.
ceCheckProfileTick will map null/0 to coInterpreter nilObject"
jmpSampleNonPrim jmpTarget: self Label.
self MoveCq: 0 R: TempReg.
self MoveR: TempReg Aw: coInterpreter newMethodAddress.
self CallRT: (self cCode: '(unsigned long)ceCheckProfileTick'
inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]).
"reenter the post-primitive call flow"
self Jump: continuePostSampleNonPrim].
jmp notNil ifTrue:
["Jump to restore of receiver reg and proceed to frame build for failure."
jmp jmpTarget: self Label.
"Restore receiver reg from stack."
self MoveMw: BytesPerWord * (methodOrBlockNumArgs + 1) r: SPReg R: ReceiverResultReg].
^0!
Item was changed:
----- Method: SimpleStackBasedCogit>>genFastPrimTraceUsing:and: (in category 'primitive generators') -----
genFastPrimTraceUsing: r1 and: r2
"Suport for compileInterpreterPrimitive. Generate inline code so as to record the primitive
trace as fast as possible."
self MoveCq: 0 R: TempReg.
self MoveCq: 0 R: r2.
self MoveMb: coInterpreter primTraceLogIndexAddress r: TempReg R: r2.
self MoveR: r2 R: r1.
self AddCq: 1 R: r1.
self MoveR: r1 Mb: coInterpreter primTraceLogIndexAddress r: TempReg.
methodLabel addDependent:
(self annotateAbsolutePCRef:
(self MoveCw: methodLabel asInteger R: r1)).
+ self MoveMw: (self offset: CogMethod of: #selector) r: r1 R: TempReg.
- self MoveMw: (self offset: CogMethod of: #selector asSymbol) r: r1 R: TempReg.
self MoveCw: coInterpreter primTraceLogAddress asInteger R: r1.
self MoveR: TempReg Xwr: r2 R: r1!
Item was changed:
----- Method: SimpleStackBasedCogit>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') -----
genMustBeBooleanTrampolineFor: boolean called: trampolineName
<var: #trampolineName type: #'char *'>
<inline: false>
opcodeIndex := 0.
"If the objectRepresentation does want true & false to be mobile then we need to record these addresses."
self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not.
self AddCq: boolean R: TempReg.
+ ^self genTrampolineFor: #ceSendMustBeBoolean:
- ^self genTrampolineFor: #ceSendMustBeBoolean: asSymbol
called: trampolineName
callJumpBar: true
numArgs: 1
arg: TempReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveClosureValue (in category 'primitive generators') -----
genPrimitiveClosureValue
"Check the argument count. Fail if wrong.
Get the method from the outerContext and see if it is cogged. If so, jump to the
block entry or the no-context-switch entry, as appropriate, and we're done. If not,
invoke the interpreter primitive."
| jumpFail jumpBCMethod primitiveRoutine result |
<var: #jumpFail type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
<var: #primitiveRoutine declareC: 'void (*primitiveRoutine)()'>
objectRepresentation genLoadSlot: ClosureNumArgsIndex sourceReg: ReceiverResultReg destReg: TempReg.
self CmpCq: (objectMemory integerObjectOf: methodOrBlockNumArgs) R: TempReg.
jumpFail := self JumpNonZero: 0.
objectRepresentation
genLoadSlot: ClosureOuterContextIndex sourceReg: ReceiverResultReg destReg: ClassReg;
genLoadSlot: MethodIndex sourceReg: ClassReg destReg: SendNumArgsReg;
genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg.
self MoveR: TempReg R: ClassReg.
jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg.
+ self MoveM16: (self offset: CogMethod of: #blockEntryOffset) r: ClassReg R: TempReg.
- self MoveM16: (self offset: CogMethod of: #blockEntryOffset asSymbol) r: ClassReg R: TempReg.
self AddR: ClassReg R: TempReg.
primitiveRoutine := coInterpreter
functionPointerForCompiledMethod: methodObj
primitiveIndex: primitiveIndex.
+ primitiveRoutine = #primitiveClosureValueNoContextSwitch ifTrue:
- primitiveRoutine = #primitiveClosureValueNoContextSwitch asSymbol ifTrue:
[blockNoContextSwitchOffset = nil ifTrue:
[^NotFullyInitialized].
self SubCq: blockNoContextSwitchOffset R: TempReg].
self JumpR: TempReg.
jumpBCMethod jmpTarget: self Label.
(result := self compileInterpreterPrimitive: primitiveRoutine) < 0 ifTrue:
[^result].
jumpFail jmpTarget: self Label.
^0!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatDivide (in category 'primitive generators') -----
genPrimitiveFloatDivide
+ ^self genDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:!
- ^self genDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg: asSymbol!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatEqual (in category 'primitive generators') -----
genPrimitiveFloatEqual
+ ^self genDoubleComparison: #JumpFPEqual: invert: false!
- ^self genDoubleComparison: #JumpFPEqual: asSymbol invert: false!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatGreaterOrEqual (in category 'primitive generators') -----
genPrimitiveFloatGreaterOrEqual
+ ^self genDoubleComparison: #JumpFPGreaterOrEqual: invert: false!
- ^self genDoubleComparison: #JumpFPGreaterOrEqual: asSymbol invert: false!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatGreaterThan (in category 'primitive generators') -----
genPrimitiveFloatGreaterThan
+ ^self genDoubleComparison: #JumpFPGreater: invert: false!
- ^self genDoubleComparison: #JumpFPGreater: asSymbol invert: false!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatLessOrEqual (in category 'primitive generators') -----
genPrimitiveFloatLessOrEqual
+ ^self genDoubleComparison: #JumpFPGreaterOrEqual: invert: true!
- ^self genDoubleComparison: #JumpFPGreaterOrEqual: asSymbol invert: true!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatLessThan (in category 'primitive generators') -----
genPrimitiveFloatLessThan
+ ^self genDoubleComparison: #JumpFPGreater: invert: true!
- ^self genDoubleComparison: #JumpFPGreater: asSymbol invert: true!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatNotEqual (in category 'primitive generators') -----
genPrimitiveFloatNotEqual
+ ^self genDoubleComparison: #JumpFPNotEqual: invert: false!
- ^self genDoubleComparison: #JumpFPNotEqual: asSymbol invert: false!
Item was changed:
----- Method: SimpleStackBasedCogit>>genTraceStoreTrampoline (in category 'initialization') -----
genTraceStoreTrampoline
+ ceTraceStoreTrampoline := self genSafeTrampolineFor: #ceTraceStoreOf:into:
- ceTraceStoreTrampoline := self genSafeTrampolineFor: #ceTraceStoreOf:into: asSymbol
called: 'ceTraceStoreTrampoline'
arg: ClassReg
arg: ReceiverResultReg!
Item was changed:
----- Method: SimpleStackBasedCogit>>generateMissAbortTrampolines (in category 'initialization') -----
generateMissAbortTrampolines
"Generate the run-time entries for the various method and PIC entry misses and aborts..
Read the class-side method trampolines for documentation on the various trampolines"
- "Slang needs these apparently superfluous asSymbol sends."
ceMethodAbortTrampoline := self genMethodAbortTrampoline.
cePICAbortTrampoline := self genPICAbortTrampoline.
+ ceCPICMissTrampoline := self genTrampolineFor: #ceCPICMiss:receiver:
- ceCPICMissTrampoline := self genTrampolineFor: #ceCPICMiss:receiver: asSymbol
called: 'ceCPICMissTrampoline'
arg: ClassReg
arg: ReceiverResultReg.
self cCode: '' inSmalltalk:
[simulatedTrampolines
at: (self simulatedAddressFor: #ceSendFromInLineCacheMiss:)
put: #ceSendFromInLineCacheMiss:]!
Item was changed:
----- Method: SimpleStackBasedCogit>>generateTracingTrampolines (in category 'initialization') -----
generateTracingTrampolines
"Generate trampolines for tracing. In the simulator we can save a lot of time
and avoid noise instructions in the lastNInstructions log by short-cutting these
trampolines, but we need them in the real vm."
ceTraceLinkedSendTrampoline
:= self cCode:
+ [self genSafeTrampolineFor: #ceTraceLinkedSend:
- [self genSafeTrampolineFor: #ceTraceLinkedSend: asSymbol
called: 'ceTraceLinkedSendTrampoline'
arg: ReceiverResultReg]
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceLinkedSend:)
put: #ceShortCutTraceLinkedSend:.
a].
ceTraceBlockActivationTrampoline
:= self cCode:
+ [self genTrampolineFor: #ceTraceBlockActivation
- [self genTrampolineFor: #ceTraceBlockActivation asSymbol
called: 'ceTraceBlockActivationTrampoline']
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceBlockActivation:)
put: #ceShortCutTraceBlockActivation:.
a].
ceTraceStoreTrampoline
:= self cCode:
+ [self genSafeTrampolineFor: #ceTraceStoreOf:into:
- [self genSafeTrampolineFor: #ceTraceStoreOf:into: asSymbol
called: 'ceTraceStoreTrampoline'
arg: ClassReg
arg: ReceiverResultReg]
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceStore:)
put: #ceShortCutTraceStore:.
a]!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>bytecodePCFor:startBcpc:in: (in category 'method map') -----
bytecodePCFor: mcpc startBcpc: startbcpc in: cogMethod
"Answer the zero-relative bytecode pc matching the machine code pc argument in
cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogBlockMethod *'>
^self
mapFor: cogMethod
bcpc: startbcpc
+ performUntil: #find:Mcpc:Bcpc:MatchingMcpc:
- performUntil: #find:Mcpc:Bcpc:MatchingMcpc: asSymbol
arg: (self cCoerceSimple: mcpc to: #'void *')!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') -----
genMustBeBooleanTrampolineFor: boolean called: trampolineName
"This can be entered in one of two states, depending on SendNumArgsReg. See
e.g. genJumpIf:to:. If SendNumArgsReg is non-zero then this has been entered via
the initial test of the counter in the jump executed count (i.e. the counter has
tripped). In this case TempReg contains the boolean to be tested and should not
be offset, and ceCounterTripped should be invoked with the unoffset TempReg.
If SendNumArgsReg is zero then this has been entered for must-be-boolean
processing. TempReg has been offset by boolean and must be corrected and
ceSendMustBeBoolean: invoked with the corrected value."
<var: #trampolineName type: #'char *'>
| jumpMBB |
<var: #jumpMBB type: #'AbstractInstruction *'>
<inline: false>
opcodeIndex := 0.
self CmpCq: 0 R: SendNumArgsReg.
jumpMBB := self JumpZero: 0.
+ self compileTrampolineFor: #ceCounterTripped:
- self compileTrampolineFor: #ceCounterTripped: asSymbol
callJumpBar: true
numArgs: 1
arg: TempReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil.
"If the objectRepresentation does want true & false to be mobile then we need to record these addresses."
self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not.
jumpMBB jmpTarget: (self AddCq: boolean R: TempReg).
+ ^self genTrampolineFor: #ceSendMustBeBoolean:
- ^self genTrampolineFor: #ceSendMustBeBoolean: asSymbol
called: trampolineName
callJumpBar: true
numArgs: 1
arg: TempReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>mcPCFor:startBcpc:in: (in category 'method map') -----
mcPCFor: bcpc startBcpc: startbcpc in: cogMethod
"Answer the absolute machine code pc matching the zero-relative bytecode pc argument
in cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogBlockMethod *'>
| absPC |
absPC := self
mapFor: cogMethod
bcpc: startbcpc
+ performUntil: #find:Mcpc:Bcpc:MatchingBcpc:
- performUntil: #find:Mcpc:Bcpc:MatchingBcpc: asSymbol
arg: (self cCoerceSimple: bcpc to: #'void *').
^absPC ~= 0
ifTrue: [absPC asUnsignedInteger - cogMethod asUnsignedInteger]
ifFalse: [absPC]!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>picDataFor:into: (in category 'method introspection') -----
picDataFor: cogMethod into: arrayObj
"Answer the zero-relative bytecode pc matching the machine code pc argument in
cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogMethod *'>
| errCode |
cogMethod stackCheckOffset = 0 ifTrue:
[^0].
picDataIndex := 0.
picData := arrayObj.
errCode := self
mapFor: (self cCoerceSimple: cogMethod to: #'CogBlockMethod *')
bcpc: (coInterpreter startPCOfMethod: cogMethod methodObject)
+ performUntil: #picDataFor:Mcpc:Bcpc:Method:
- performUntil: #picDataFor:Mcpc:Bcpc:Method: asSymbol
arg: (self cCoerceSimple: cogMethod to: #'void *').
errCode ~= 0 ifTrue:
[self assert: errCode = PrimErrNoMemory.
^-1].
^picDataIndex!
Item was changed:
----- Method: StackInterpreter>>addNewMethodToCache: (in category 'method lookup cache') -----
addNewMethodToCache: class
"Add the given entry to the method cache.
The policy is as follows:
Look for an empty entry anywhere in the reprobe chain.
If found, install the new entry there.
If not found, then install the new entry at the first probe position
and delete the entries in the rest of the reprobe chain.
This has two useful purposes:
If there is active contention over the first slot, the second
or third will likely be free for reentry after ejection.
Also, flushing is good when reprobe chains are getting full."
| probe hash primitiveIndex |
<inline: false>
hash := messageSelector bitXor: class. "drop low-order zeros from addresses"
(objectMemory isOopCompiledMethod: newMethod)
ifTrue:
[primitiveIndex := self primitiveIndexOf: newMethod.
primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: class]
ifFalse:
+ [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod].
- [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod asSymbol].
0 to: CacheProbeMax-1 do:
[:p | probe := (hash >> p) bitAnd: MethodCacheMask.
(methodCache at: probe + MethodCacheSelector) = 0 ifTrue:
["Found an empty entry -- use it"
methodCache at: probe + MethodCacheSelector put: messageSelector.
methodCache at: probe + MethodCacheClass put: class.
methodCache at: probe + MethodCacheMethod put: newMethod.
methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: #long).
lastMethodCacheProbeWrite := probe. "this for primitiveExternalMethod"
^ nil]].
"OK, we failed to find an entry -- install at the first slot..."
probe := hash bitAnd: MethodCacheMask. "first probe"
methodCache at: probe + MethodCacheSelector put: messageSelector.
methodCache at: probe + MethodCacheClass put: class.
methodCache at: probe + MethodCacheMethod put: newMethod.
methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: #long).
lastMethodCacheProbeWrite := probe. "this for primitiveExternalMethod"
"...and zap the following entries"
1 to: CacheProbeMax-1 do:
[:p | probe := (hash >> p) bitAnd: MethodCacheMask.
methodCache at: probe + MethodCacheSelector put: 0]!
Item was changed:
----- Method: StackInterpreterSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') -----
ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength
"Load and return the requested function from a module"
| pluginString functionString |
pluginString := String new: moduleLength.
1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)].
functionString := String new: functionLength.
1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)].
- functionString := functionString asSymbol.
^self ioLoadFunction: functionString From: pluginString!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genMethodAbortTrampolineFor: (in category 'initialization') -----
genMethodAbortTrampolineFor: numArgs
"Generate the abort for a method. This abort performs either a call of ceSICMiss:
to handle a single-in-line cache miss or a call of ceStackOverflow: to handle a
stack overflow. It distinguishes the two by testing ResultReceiverReg. If the
register is zero then this is a stack-overflow because a) the receiver has already
been pushed and so can be set to zero before calling the abort, and b) the
receiver must always contain an object (and hence be non-zero) on SIC miss."
| jumpSICMiss |
<var: #jumpSICMiss type: #'AbstractInstruction *'>
opcodeIndex := 0.
self CmpCq: 0 R: ReceiverResultReg.
jumpSICMiss := self JumpNonZero: 0.
+ self compileTrampolineFor: #ceStackOverflow:
- self compileTrampolineFor: #ceStackOverflow: asSymbol
callJumpBar: true
numArgs: 1
arg: SendNumArgsReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil.
jumpSICMiss jmpTarget: self Label.
self genPushRegisterArgsForAbortMissNumArgs: numArgs.
+ ^self genTrampolineFor: #ceSICMiss:
- ^self genTrampolineFor: #ceSICMiss: asSymbol
called: (self trampolineName: 'ceMethodAbort' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1]))
callJumpBar: true
numArgs: 1
arg: ReceiverResultReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPICMissTrampolineFor: (in category 'initialization') -----
genPICMissTrampolineFor: numArgs
| startAddress |
<var: #aString type: #'char *'>
<inline: false>
startAddress := methodZoneBase.
opcodeIndex := 0.
"N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack."
self genPushRegisterArgsForNumArgs: numArgs.
+ self genTrampolineFor: #ceCPICMiss:receiver:
- self genTrampolineFor: #ceCPICMiss:receiver: asSymbol
called: (self trampolineName: 'cePICMiss' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1]))
callJumpBar: true
numArgs: 2
arg: ClassReg
arg: ReceiverResultReg
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true.
^startAddress!
Item was changed:
----- Method: StackToRegisterMappingCogit>>generateEnilopmarts (in category 'initialization') -----
generateEnilopmarts
"Enilopmarts transfer control from C into machine code (backwards trampolines).
Override to add version for generic and PIC-specific entry with reg args."
super generateEnilopmarts.
self cppIf: Debug
ifTrue:
[realCEEnterCogCodePopReceiverArg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
called: 'realCEEnterCogCodePopReceiverArg0Regs'.
+ ceEnterCogCodePopReceiverArg0Regs := #enterCogCodePopReceiverArg0Regs.
- ceEnterCogCodePopReceiverArg0Regs := #enterCogCodePopReceiverArg0Regs asSymbol.
realCEEnterCogCodePopReceiverArg1Arg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
and: Arg1Reg
called: 'realCEEnterCogCodePopReceiverArg1Arg0Regs'.
+ ceEnterCogCodePopReceiverArg1Arg0Regs := #enterCogCodePopReceiverArg1Arg0Regs]
- ceEnterCogCodePopReceiverArg1Arg0Regs := #enterCogCodePopReceiverArg1Arg0Regs asSymbol]
ifFalse:
[ceEnterCogCodePopReceiverArg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
called: 'ceEnterCogCodePopReceiverArg0Regs'.
ceEnterCogCodePopReceiverArg1Arg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
and: Arg1Reg
called: 'ceEnterCogCodePopReceiverArg1Arg0Regs'].
"These are special versions of the ceEnterCogCodePopReceiverAndClassRegs enilopmart that also
pop register argsfrom the stack to undo the pushing of register args in the abort/miss trampolines."
ceEnter0ArgsPIC := self genEnterPICEnilopmartNumArgs: 0.
self numRegArgs >= 1 ifTrue:
[ceEnter1ArgsPIC := self genEnterPICEnilopmartNumArgs: 1.
self numRegArgs >= 2 ifTrue:
[ceEnter1ArgsPIC := self genEnterPICEnilopmartNumArgs: 2.
self assert: self numRegArgs = 2]]!
Item was changed:
----- Method: StackToRegisterMappingCogit>>generateSendTrampolines (in category 'initialization') -----
generateSendTrampolines
"Override to generate code to push the register arg(s) for <= numRegArg arity sends."
- "Slang needs these apparently superfluous asSymbol sends."
0 to: NumSendTrampolines - 2 do:
[:numArgs|
sendTrampolines
at: numArgs
+ put: (self genSendTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: asSymbol
numArgs: numArgs
called: (self trampolineName: 'ceSend' numArgs: numArgs)
arg: ClassReg
arg: 0
arg: ReceiverResultReg
arg: numArgs)].
sendTrampolines
at: NumSendTrampolines - 1
+ put: (self genSendTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: asSymbol
numArgs: self numRegArgs + 1
called: (self trampolineName: 'ceSend' numArgs: -1)
arg: ClassReg
arg: 0
arg: ReceiverResultReg
arg: SendNumArgsReg).
self cppIf: NewspeakVM
ifTrue:
[0 to: NumSendTrampolines - 2 do:
[:numArgs|
dynamicSuperSendTrampolines
at: numArgs
+ put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs:
- put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs: asSymbol
numArgs: numArgs
called: (self trampolineName: 'ceDynSuperSend' numArgs: numArgs)
arg: ClassReg
arg: ReceiverResultReg
arg: numArgs)].
dynamicSuperSendTrampolines
at: NumSendTrampolines - 1
+ put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs:
- put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs: asSymbol
numArgs: self numRegArgs + 1
called: (self trampolineName: 'ceDynSuperSend' numArgs: -1)
arg: ClassReg
arg: ReceiverResultReg
arg: SendNumArgsReg)].
0 to: NumSendTrampolines - 2 do:
[:numArgs|
superSendTrampolines
at: numArgs
+ put: (self genSendTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: asSymbol
numArgs: numArgs
called: (self trampolineName: 'ceSuperSend' numArgs: numArgs)
arg: ClassReg
arg: 1
arg: ReceiverResultReg
arg: numArgs)].
superSendTrampolines
at: NumSendTrampolines - 1
+ put: (self genSendTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: asSymbol
numArgs: self numRegArgs + 1
called: (self trampolineName: 'ceSuperSend' numArgs: -1)
arg: ClassReg
arg: 1
arg: ReceiverResultReg
arg: SendNumArgsReg).
firstSend := sendTrampolines at: 0.
lastSend := superSendTrampolines at: NumSendTrampolines - 1!
Item was changed:
----- Method: StackToRegisterMappingCogit>>generateTracingTrampolines (in category 'initialization') -----
generateTracingTrampolines
"Generate trampolines for tracing. In the simulator we can save a lot of time
and avoid noise instructions in the lastNInstructions log by short-cutting these
trampolines, but we need them in the real vm."
ceTraceLinkedSendTrampoline
:= self cCode:
+ [self genSafeTrampolineFor: #ceTraceLinkedSend:
- [self genSafeTrampolineFor: #ceTraceLinkedSend: asSymbol
called: 'ceTraceLinkedSendTrampoline'
arg: ReceiverResultReg]
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceLinkedSend:)
put: #ceShortCutTraceLinkedSend:.
a].
ceTraceBlockActivationTrampoline
:= self cCode:
+ [self genTrampolineFor: #ceTraceBlockActivation
- [self genTrampolineFor: #ceTraceBlockActivation asSymbol
called: 'ceTraceBlockActivationTrampoline']
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceBlockActivation:)
put: #ceShortCutTraceBlockActivation:.
a].
ceTraceStoreTrampoline
:= self cCode:
+ [self genSafeTrampolineFor: #ceTraceStoreOf:into:
- [self genSafeTrampolineFor: #ceTraceStoreOf:into: asSymbol
called: 'ceTraceStoreTrampoline'
arg: TempReg
arg: ReceiverResultReg]
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceStore:)
put: #ceShortCutTraceStore:.
a]!
Item was changed:
----- Method: StackToRegisterMappingCogit>>v3:Is:Push:Nil: (in category 'span functions') -----
v3: descriptor Is: pc Push: nExts Nil: aMethodObj
<var: #descriptor type: #'BytecodeDescriptor *'>
<inline: true>
+ ^descriptor generator == #genPushConstantNilBytecode!
- ^descriptor generator == #genPushConstantNilBytecode asSymbol!
Item was changed:
----- Method: StackToRegisterMappingCogit>>v4:Is:Push:Nil: (in category 'span functions') -----
v4: descriptor Is: pc Push: nExts Nil: aMethodObj
<var: #descriptor type: #'BytecodeDescriptor *'>
<inline: true>
+ ^descriptor generator == #genExtPushPseudoVariableOrOuterBytecode
- ^descriptor generator == #genExtPushPseudoVariableOrOuterBytecode asSymbol
and: [self assert: (objectMemory fetchByte: pc ofObject: aMethodObj) = 77.
nExts = 1
and: [(objectMemory fetchByte: pc - 1 ofObject: aMethodObj) = 2]]!
Item was added:
+ ----- Method: Symbol>>defined (in category '*VMMaker-interpreter simulator') -----
+ defined
+ "To allow constructs such as self cppIf: #'SA_NOCLDSTOP' defined ifTrue: [...].
+ We could go look for a definition but likely there won't be one."
+ ^false!
Item was changed:
----- Method: TConstantNode>>printOn:level: (in category 'printing') -----
printOn: aStream level: level
+ value isSymbol
+ ifTrue: [aStream nextPutAll: (value copyWithout: $:)]
+ ifFalse: [value storeOn: aStream]!
-
- value storeOn: aStream.!
Item was changed:
----- Method: TParseNode>>allCalls (in category 'utilities') -----
allCalls
"Answer a collection of selectors for the messages sent in this parse tree."
| calls |
+ calls := Set new: 32.
- calls := Set new: 100.
self nodesDo:
+ [:node|
- [ :node |
node isSend ifTrue:
+ [calls add: node selector].
+ (node isConstant and: [node value isSymbol]) ifTrue:
+ [calls add: node value]].
- [((calls add: node selector) = #asSymbol
- and: [node receiver isConstant
- and: [node receiver value isSymbol]]) ifTrue:
- [calls add: node receiver value]]].
^calls!
Item was changed:
----- Method: ThreadedFFIPlugin>>ffiCall:ArgArrayOrNil:NumArgs: (in category 'callout support') -----
ffiCall: externalFunction ArgArrayOrNil: argArrayOrNil NumArgs: nArgs
"Generic callout. Does the actual work. If argArrayOrNil is nil it takes args from the stack
and the spec from the method. If argArrayOrNil is not nil takes args from argArrayOrNil
and the spec from the receiver."
| flags argTypeArray address argType oop argSpec argClass err theCalloutState calloutState requiredStackSize stackSize allocation result |
<inline: true>
<var: #theCalloutState type: #'CalloutState'>
<var: #calloutState type: #'CalloutState *'>
<var: #allocation type: #'char *'>
(interpreterProxy is: externalFunction KindOfClass: interpreterProxy classExternalFunction) ifFalse:
[^self ffiFail: FFIErrorNotFunction].
"Load and check the values in the externalFunction before we call out"
flags := interpreterProxy fetchInteger: ExternalFunctionFlagsIndex ofObject: externalFunction.
interpreterProxy failed ifTrue:
[^self ffiFail: FFIErrorBadArgs].
"This must come early for compatibility with the old FFIPlugin. Image-level code
may assume the function pointer is loaded eagerly. Thanks to Nicolas Cellier."
address := self ffiLoadCalloutAddress: externalFunction.
interpreterProxy failed ifTrue:
[^0 "error code already set by ffiLoadCalloutAddress:"].
argTypeArray := interpreterProxy fetchPointer: ExternalFunctionArgTypesIndex ofObject: externalFunction.
"must be array of arg types"
((interpreterProxy isArray: argTypeArray)
and: [(interpreterProxy slotSizeOf: argTypeArray) = (nArgs + 1)]) ifFalse:
[^self ffiFail: FFIErrorBadArgs].
"check if the calling convention is supported"
self cppIf: COGMTVM
ifTrue:
[(self ffiSupportsCallingConvention: (flags bitAnd: FFICallTypesMask)) ifFalse:
[^self ffiFail: FFIErrorCallType]]
ifFalse: "not masking causes threaded calls to fail, which is as they should if the plugin is not threaded."
[(self ffiSupportsCallingConvention: flags) ifFalse:
[^self ffiFail: FFIErrorCallType]].
requiredStackSize := self externalFunctionHasStackSizeSlot
ifTrue: [interpreterProxy
fetchInteger: ExternalFunctionStackSizeIndex
ofObject: externalFunction]
ifFalse: [-1].
interpreterProxy failed ifTrue:
[^interpreterProxy primitiveFailFor: (argArrayOrNil isNil
ifTrue: [PrimErrBadMethod]
ifFalse: [PrimErrBadReceiver])].
stackSize := requiredStackSize < 0 ifTrue: [DefaultMaxStackSize] ifFalse: [requiredStackSize].
self cCode: [] inSmalltalk: [theCalloutState := self class calloutStateClass new].
calloutState := self addressOf: theCalloutState.
+ self cCode: [self me: calloutState ms: 0 et: (self sizeof: #CalloutState)].
- self cCode: [self me: calloutState ms: 0 et: (self sizeof: #CalloutState asSymbol)].
calloutState callFlags: flags.
"Fetch return type and args"
argType := interpreterProxy fetchPointer: 0 ofObject: argTypeArray.
argSpec := interpreterProxy fetchPointer: 0 ofObject: argType.
argClass := interpreterProxy fetchPointer: 1 ofObject: argType.
(err := self ffiCheckReturn: argSpec With: argClass in: calloutState) ~= 0 ifTrue:
[^self ffiFail: err]. "cannot return"
"alloca the outgoing stack frame, leaving room for register args while marshalling, and including space for the return struct, if any."
allocation := self alloca: stackSize + calloutState structReturnSize + self registerArgsSlop + self cStackAlignment.
self allocaLiesSoUseGetsp ifTrue:
[allocation := self getsp].
self cStackAlignment ~= 0 ifTrue:
[allocation := self cCoerce: (allocation asUnsignedInteger bitClear: self cStackAlignment - 1)
to: #'char *'].
calloutState
argVector: allocation;
currentArg: allocation + self registerArgsSlop;
limit: allocation + stackSize + self registerArgsSlop.
(calloutState structReturnSize > 0
and: [self nonRegisterStructReturnIsViaImplicitFirstArgument
and: [(self returnStructInRegisters: calloutState structReturnSize) not]]) ifTrue:
[err := self ffiPushPointer: calloutState limit in: calloutState.
err ~= 0 ifTrue:
[self cleanupCalloutState: calloutState.
self cppIf: COGMTVM ifTrue:
[err = PrimErrObjectMayMove negated ifTrue:
[^PrimErrObjectMayMove]]. "N.B. Do not fail if object may move because caller will GC and retry."
^self ffiFail: err]].
1 to: nArgs do:
[:i|
argType := interpreterProxy fetchPointer: i ofObject: argTypeArray.
argSpec := interpreterProxy fetchPointer: 0 ofObject: argType.
argClass := interpreterProxy fetchPointer: 1 ofObject: argType.
oop := argArrayOrNil isNil
ifTrue: [interpreterProxy stackValue: nArgs - i]
ifFalse: [interpreterProxy fetchPointer: i - 1 ofObject: argArrayOrNil].
err := self ffiArgument: oop Spec: argSpec Class: argClass in: calloutState.
err ~= 0 ifTrue:
[self cleanupCalloutState: calloutState.
self cppIf: COGMTVM ifTrue:
[err = PrimErrObjectMayMove negated ifTrue:
[^PrimErrObjectMayMove]]. "N.B. Do not fail if object may move because caller will GC and retry."
^self ffiFail: err]]. "coercion failed or out of stack space"
"Failures must be reported back from ffiArgument:Spec:Class:in:.
Should not fail from here on in."
self assert: interpreterProxy failed not.
self ffiLogCallout: externalFunction.
(requiredStackSize < 0
and: [self externalFunctionHasStackSizeSlot]) ifTrue:
[stackSize := calloutState currentArg - calloutState argVector.
interpreterProxy storeInteger: ExternalFunctionStackSizeIndex ofObject: externalFunction withValue: stackSize].
"Go out and call this guy"
result := self ffiCalloutTo: address SpecOnStack: argArrayOrNil notNil in: calloutState.
self cleanupCalloutState: calloutState.
^result!
Item was removed:
- ----- Method: VMClass class>>browseSymbolRefsMissingAsSymbolSendLocalToPackage: (in category 'utilities') -----
- browseSymbolRefsMissingAsSymbolSendLocalToPackage: aPackageName
- "Slang will bite you hard if you write e.g.
- self sizeof: #mytype
- because it will translate this as
- sizeof(''mytype'').
- Instead you must write
- self sizeof: #mytype asSymbol
- because it will translate this as
- sizeof(mytype).
- This is a really easy slip to make (and arguably a horrible bug in Slang, but backward-compatibility etc, bitch, moan.
- So here's a scanner to find any offending occurrences. Forgive the deluge of false positives.
-
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #VMMaker.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #VMConstruction.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #'Qwaq-Plugins'.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #'Cog-ProcessorPlugins'.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #'SqueakSSL-Plugin'.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #'Freetype-Plugin'"
-
- SystemNavigation new
- browseAllSelect:
- [:m| | is bad prevLit |
- m methodClass isMeta not
- and: [(m pragmaAt: #doNotGenerate) isNil
- and: [is := InstructionStream on: m.
- bad := false.
- [is atEnd] whileFalse:
- [[is interpretNextInstructionFor: nil]
- on: MessageNotUnderstood
- do: [:ex| | s args |
- s := ex message selector.
- args := ex message arguments.
- prevLit ifNotNil:
- [(s = #send:super:numArgs:
- and: [#(asSymbol cCoerceSimple:to: cCoerce:to: flag: primitive:parameters:receiver:)
- includes: args first]) ifFalse:
- [bad := true]].
- prevLit := (s == #pushConstant: and: [args first isSymbol]) ifTrue:
- [args first]]].
- bad]]]
- localToPackage: aPackageName!
1
0
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.234.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.234
Author: eem
Time: 13 December 2012, 3:58:19.013 pm
UUID: 66acafd1-cad0-4f20-b786-ab8f48201d82
Ancestors: VMMaker.oscog-eem.233
Fix semicolons appearing after the #endif on expanding expandDereferenceInterpreterProxyFunctionTable
=============== Diff against VMMaker.oscog-eem.232 ===============
Item was changed:
----- Method: BlockNode>>isPotentialCCaseLabel (in category '*VMMaker-C translation') -----
isPotentialCCaseLabel
| stmt |
^statements size = 1
and: [(stmt := statements first) isVariableNode
+ or: [(stmt isLiteralNode
+ and: [stmt isConstantNumber or: [stmt literalValue isSymbol]])
- or: [stmt isConstantNumber
or: [stmt isMessageNode
and: [stmt selector key = #asSymbol
+ and: [stmt receiver isLiteralNode
- and: [stmt receiver isLiteral
and: [stmt receiver literalValue isSymbol]]]]]]!
Item was changed:
----- Method: CCodeGenerator>>cFunctionNameFor: (in category 'C code generator') -----
cFunctionNameFor: aSelector
+ "Create a C function name from the given selector by finding
+ a specific translation, or if none, simply omitting colons."
- "Create a C function name from the given selector by omitting colons
- and prefixing with the plugin name if the method is exported."
^selectorTranslations at: aSelector ifAbsent: [aSelector copyWithout: $:]!
Item was changed:
----- Method: CCodeGenerator>>cLiteralFor: (in category 'C code generator') -----
cLiteralFor: anObject
"Return a string representing the C literal value for the given object."
anObject isNumber
ifTrue:
[anObject isInteger ifTrue:
[^(anObject < 16r7FFFFFFF)
ifTrue: [anObject printString]
ifFalse: [anObject printString , ObjectMemory unsignedIntegerSuffix]].
anObject isFloat ifTrue:
[^anObject printString]]
ifFalse:
+ [anObject isSymbol ifTrue:
+ [^self cFunctionNameFor: anObject].
+ anObject isString ifTrue:
- [anObject isString ifTrue:
[^'"', (anObject copyReplaceAll: (String with: Character cr) with: '\n') , '"'].
anObject == nil ifTrue: [^ 'null' ].
anObject == true ifTrue: [^ '1' ].
anObject == false ifTrue: [^ '0' ].
anObject isCharacter ifTrue:
[^anObject == $'
ifTrue: ['''\'''''] "i.e. '\''"
ifFalse: [anObject asString printString]]].
self error: 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString.
^'"XXX UNTRANSLATABLE CONSTANT XXX"'!
Item was changed:
----- Method: CCodeGenerator>>cLiteralFor:name: (in category 'C code generator') -----
cLiteralFor: anObject name: smalltalkName
+ "Return a string representing the C literal value for the given object.
+ This version may use hex for integers that are bit masks."
- "Return a string representing the C literal value for the given object."
anObject isInteger ifTrue:
[| hex dec rep |
hex := anObject printStringBase: 16.
dec := anObject printStringBase: 10.
rep := ((smalltalkName endsWith: 'Mask')
or: [anObject digitLength > 1
and: [(hex asSet size * 3) <= (dec asSet size * 2)
and: [(smalltalkName endsWith: 'Size') not]]])
ifTrue: [hex first = $- ifTrue: ['-0x', hex allButFirst] ifFalse: ['0x', hex]]
ifFalse: [dec].
^(anObject < 16r7FFFFFFF)
ifTrue: [rep]
ifFalse: [rep, ObjectMemory unsignedIntegerSuffix "ikp"]].
+ ^self cLiteralFor: anObject!
- anObject isFloat ifTrue:
- [^anObject printString].
- anObject isString ifTrue:
- [^'"', (anObject copyReplaceAll: (String with: Character cr) with: '\n') , '"'].
- anObject == nil ifTrue: [^ 'null' ].
- anObject == true ifTrue: [^ '1' ]. "ikp"
- anObject == false ifTrue: [^ '0' ]. "ikp"
- anObject isCharacter ifTrue:[^anObject asString printString]. "ar"
- self error: 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString.
- ^'"XXX UNTRANSLATABLE CONSTANT XXX"'!
Item was added:
+ ----- Method: CCodeGenerator>>generateFlag:on:indent: (in category 'C translation') -----
+ generateFlag: msgNode on: aStream indent: level
+ "Compoensate for the use of self flag: #aSymbol. We used to translate symbols
+ as strings unless they were quoted via #aSymbol asSymbol. But this is too tedious,
+ so we now translate symbols directly. The only use that this affected was in
+ self flag: #aSymbol,
+ so hard-code it to produce a string value. Note that this isn't strictly necessary
+ because there's a
+ #define flag(foo) 0
+ in C land, but it makes the generated C less dissonant."
+
+ aStream
+ nextPutAll: 'flag(';
+ nextPutAll: (self cLiteralFor: msgNode args last value asString);
+ nextPut: $)!
Item was changed:
----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') -----
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:
#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 #generateBitInvert32:on:indent:
#bitClear: #generateBitClear: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:
#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:
#signedIntFromLong #generateSignedIntFromLong:on:indent:
#signedIntToLong #generateSignedIntToLong:on:indent:
#signedIntFromShort #generateSignedIntFromShort: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:
#asUnsignedLong #generateAsUnsignedLong:on:indent:
#asSymbol #generateAsSymbol:on:indent:
+ #flag: #generateFlag:on:indent:
#anyMask: #generateBitAnd:on:indent:
#raisedTo: #generateRaisedTo:on:indent:
#touch: #generateTouch:on:indent:
#bytesPerWord #generateBytesPerWord:on:indent:
#baseHeaderSize #generateBaseHeaderSize: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:
#shouldNotImplement #generateSmalltalkMetaError:on:indent:
#shouldBeImplemented #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:
).
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>>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 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 nil out values that differ in the StackInterpreter."
+ FrameSlots := #undeclared.
- FrameSlots := #undeclared asSymbol.
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 := #undeclared.
- FoxCallerContext := #undeclared asSymbol.
FoxSavedFP := fxSavedFP * BytesPerWord.
FoxMethod := fxMethod * BytesPerWord.
FoxThisContext := fxThisContext * BytesPerWord.
+ FoxFrameFlags := #undeclared.
- FoxFrameFlags := #undeclared asSymbol.
FoxIFrameFlags := fxIFrameFlags * BytesPerWord.
FoxIFSavedIP := fxIFSavedIP * BytesPerWord.
+ FoxReceiver := #undeclared.
- FoxReceiver := #undeclared asSymbol.
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.
MFMethodFlagsMask := MFMethodFlagHasContextFlag + MFMethodFlagIsBlockFlag.
MFMethodMask := (MFMethodFlagsMask + 1) negated!
Item was changed:
----- Method: CoInterpreter>>addNewMethodToCache: (in category 'method lookup cache') -----
addNewMethodToCache: class
"Override to refuse to cache other than compiled methods.
This protects open PICs against having to test for compiled methods."
(objectMemory isOopCompiledMethod: newMethod) ifFalse:
+ [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod.
- [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod asSymbol.
^self].
super addNewMethodToCache: class!
Item was changed:
----- Method: CoInterpreter>>assertValidExecutionPointe:r:s:imbar: (in category 'debug support') -----
assertValidExecutionPointe: lip r: lifp s: lisp imbar: inInterpreter
<var: #lip type: #usqInt>
<var: #lifp type: #'char *'>
<var: #lisp type: #'char *'>
| methodField cogMethod |
<var: #cogMethod type: #'CogMethod *'>
self assert: stackPage = (stackPages stackPageFor: lifp).
self assert: stackPage = stackPages mostRecentlyUsedPage.
+ self deferStackLimitSmashAround: #assertValidStackLimits.
- self deferStackLimitSmashAround: #assertValidStackLimits asSymbol.
self assert: lifp < stackPage baseAddress.
self assert: lisp < lifp.
self assert: lifp > lisp.
self assert: lisp >= (stackPage realStackLimit - self stackLimitOffset).
self assert: (lifp - lisp) < LargeContextSize.
methodField := self frameMethodField: lifp.
inInterpreter
ifTrue:
[self assert: (self isMachineCodeFrame: lifp) not.
self assert: method = methodField.
self cppIf: MULTIPLEBYTECODESETS
ifTrue: [self assert: (self methodUsesAlternateBytecodeSet: method) = (bytecodeSetSelector = 256)].
((self asserta: methodField asUnsignedInteger > objectMemory startOfMemory)
and: [self asserta: methodField asUnsignedInteger < objectMemory freeStart]) ifTrue:
[lip ~= cogit ceReturnToInterpreterPC ifTrue:
[self assert: (lip >= (methodField + (objectMemory lastPointerOf: methodField) + BaseHeaderSize - 1)
and: [lip < (methodField + (objectMemory byteLengthOf: methodField) + BaseHeaderSize)])]].
self assert: ((self iframeIsBlockActivation: lifp)
or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self iframeReceiver: lifp)])]
ifFalse:
[self assert: (self isMachineCodeFrame: lifp).
((self asserta: methodField asUnsignedInteger >= cogit minCogMethodAddress)
and: [self asserta: methodField asUnsignedInteger < cogit maxCogMethodAddress]) ifTrue:
[cogMethod := self mframeHomeMethod: lifp.
self assert: (lip > (methodField + ((self mframeIsBlockActivation: lifp)
ifTrue: [self sizeof: CogBlockMethod]
ifFalse: [self sizeof: CogMethod]))
and: [lip < (methodField + cogMethod blockSize)])].
self assert: ((self mframeIsBlockActivation: lifp)
or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self mframeReceiver: lifp)])].
(self isBaseFrame: lifp) ifTrue:
[self assert: (self frameHasContext: lifp).
self assert: (self frameContext: lifp) = (stackPages longAt: stackPage baseAddress - BytesPerWord)]!
Item was changed:
----- Method: CoInterpreter>>bytecodePrimAt (in category 'common selector sends') -----
bytecodePrimAt
"BytecodePrimAt will only succeed if the receiver is in the atCache.
Otherwise it will fail so that the more general primitiveAt will put it in the
cache after validating that message lookup results in a primitive response.
Override to insert in the at: cache here. This is necessary since once there
is a compiled at: primitive method (which doesn't use the at: cache) the only
way something can get installed in the atCache is here."
| index rcvr result atIx |
index := self internalStackTop.
rcvr := self internalStackValue: 1.
((objectMemory isIntegerObject: rcvr) not
and: [objectMemory isIntegerObject: index]) ifTrue:
[atIx := rcvr bitAnd: AtCacheMask. "Index into atCache = 4N, for N = 0 ... 7"
(atCache at: atIx+AtCacheOop) ~= rcvr ifTrue:
[lkupClass := objectMemory fetchClassOfNonInt: rcvr.
messageSelector := self specialSelector: 16.
(self lookupInMethodCacheSel: messageSelector class: lkupClass) ifFalse:
[argumentCount := 1.
^self commonSend].
+ primitiveFunctionPointer == #primitiveAt
- primitiveFunctionPointer == #primitiveAt asSymbol
ifTrue: [self install: rcvr inAtCache: atCache at: atIx string: false]
ifFalse:
+ [primitiveFunctionPointer == #primitiveStringAt
- [primitiveFunctionPointer == #primitiveStringAt asSymbol
ifTrue: [self install: rcvr inAtCache: atCache at: atIx string: true]
ifFalse:
[argumentCount := 1.
^self commonSend]]].
self successful ifTrue:
[result := self commonVariable: rcvr at: (objectMemory integerValueOf: index) cacheIndex: atIx].
self successful ifTrue:
[self fetchNextBytecode.
^self internalPop: 2 thenPush: result].
self initPrimCall].
messageSelector := self specialSelector: 16.
argumentCount := 1.
self normalSend!
Item was changed:
----- Method: CoInterpreter>>bytecodePrimAtPut (in category 'common selector sends') -----
bytecodePrimAtPut
"BytecodePrimAtPut will only succeed if the receiver is in the atCache.
Otherwise it will fail so that the more general primitiveAtPut will put it in the
cache after validating that message lookup results in a primitive response.
Override to insert in the atCache here. This is necessary since once there
is a compiled at:[put:] primitive method (which doesn't use the at: cache) the
only way something can get installed in the atCache is here."
| index rcvr atIx value |
value := self internalStackTop.
index := self internalStackValue: 1.
rcvr := self internalStackValue: 2.
((objectMemory isIntegerObject: rcvr) not
and: [objectMemory isIntegerObject: index]) ifTrue:
[atIx := (rcvr bitAnd: AtCacheMask) + AtPutBase. "Index into atPutCache"
(atCache at: atIx+AtCacheOop) ~= rcvr ifTrue:
[lkupClass := objectMemory fetchClassOfNonInt: rcvr.
messageSelector := self specialSelector: 17.
(self lookupInMethodCacheSel: messageSelector class: lkupClass) ifFalse:
[argumentCount := 2.
^self commonSend].
+ primitiveFunctionPointer == #primitiveAtPut
- primitiveFunctionPointer == #primitiveAtPut asSymbol
ifTrue: [self install: rcvr inAtCache: atCache at: atIx string: false]
ifFalse:
+ [primitiveFunctionPointer == #primitiveStringAtPut
- [primitiveFunctionPointer == #primitiveStringAtPut asSymbol
ifTrue: [self install: rcvr inAtCache: atCache at: atIx string: true]
ifFalse:
[argumentCount := 2.
^self commonSend]]].
self successful ifTrue:
[self commonVariable: rcvr at: (objectMemory integerValueOf: index) put: value cacheIndex: atIx].
self successful ifTrue:
[self fetchNextBytecode.
^self internalPop: 3 thenPush: value].
self initPrimCall].
messageSelector := self specialSelector: 17.
argumentCount := 2.
self normalSend!
Item was changed:
----- Method: CoInterpreter>>callbackEnter: (in category 'callback support') -----
callbackEnter: callbackID
"Re-enter the interpreter for executing a callback"
| currentCStackPointer currentCFramePointer savedReenterInterpreter
wasInMachineCode calledFromMachineCode |
<volatile>
<export: true>
<var: #currentCStackPointer type: #'void *'>
<var: #currentCFramePointer type: #'void *'>
<var: #callbackID type: #'sqInt *'>
<var: #savedReenterInterpreter type: #'jmp_buf'>
"For now, do not allow a callback unless we're in a primitiveResponse"
(self asserta: primitiveFunctionPointer ~= 0) ifFalse:
[^false].
self assert: primFailCode = 0.
"Check if we've exceeded the callback depth"
(self asserta: jmpDepth < MaxJumpBuf) ifFalse:
[^false].
jmpDepth := jmpDepth + 1.
wasInMachineCode := self isMachineCodeFrame: framePointer.
calledFromMachineCode := instructionPointer <= objectMemory startOfMemory.
"Suspend the currently active process"
suspendedCallbacks at: jmpDepth put: self activeProcess.
"We need to preserve newMethod explicitly since it is not activated yet
and therefore no context has been created for it. If the caller primitive
for any reason decides to fail we need to make sure we execute the correct
method and not the one 'last used' in the call back"
suspendedMethods at: jmpDepth put: newMethod.
self flag: 'need to debug this properly. Conceptually it is the right thing to do but it crashes in practice'.
false
ifTrue:
["Signal external semaphores since a signalSemaphoreWithIndex: request may
have been issued immediately prior to this callback before the VM has any
chance to do a signalExternalSemaphores in checkForEventsMayContextSwitch:"
self signalExternalSemaphores.
"If no process is awakened by signalExternalSemaphores then transfer
to the highest priority runnable one."
(suspendedCallbacks at: jmpDepth) == self activeProcess ifTrue:
[self transferTo: self wakeHighestPriority from: CSCallbackLeave]]
ifFalse:
[self transferTo: self wakeHighestPriority from: CSCallbackLeave].
"Typically, invoking the callback means that some semaphore has been
signaled to indicate the callback. Force an interrupt check as soon as possible."
self forceInterruptCheck.
"Save the previous CStackPointers and interpreter entry jmp_buf."
currentCStackPointer := cogit getCStackPointer.
currentCFramePointer := cogit getCFramePointer.
self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf').
- y: (self sizeof: #'jmp_buf' asSymbol).
cogit assertCStackWellAligned.
(self setjmp: (jmpBuf at: jmpDepth)) == 0 ifTrue: "Fill in callbackID"
[callbackID at: 0 put: jmpDepth.
self enterSmalltalkExecutive.
self assert: false "NOTREACHED"].
"Restore the previous CStackPointers and interpreter entry jmp_buf."
cogit setCStackPointer: currentCStackPointer.
cogit setCFramePointer: currentCFramePointer.
self mem: reenterInterpreter
cp: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
+ y: (self sizeof: #'jmp_buf').
- y: (self sizeof: #'jmp_buf' asSymbol).
"Transfer back to the previous process so that caller can push result"
self putToSleep: self activeProcess yieldingIf: preemptionYields.
self transferTo: (suspendedCallbacks at: jmpDepth) from: CSCallbackLeave.
newMethod := suspendedMethods at: jmpDepth. "see comment above"
argumentCount := self argumentCountOf: newMethod.
self assert: wasInMachineCode = (self isMachineCodeFrame: framePointer).
calledFromMachineCode
ifTrue:
[instructionPointer >= objectMemory startOfMemory ifTrue:
[self iframeSavedIP: framePointer put: instructionPointer.
instructionPointer := cogit ceReturnToInterpreterPC]]
ifFalse:
["Even if the context was flushed to the heap and rebuilt in transferTo:from:
above it will remain an interpreted frame because the context's pc would
remain a bytecode pc. So the instructionPointer must also be a bytecode pc."
self assert: (self isMachineCodeFrame: framePointer) not.
self assert: instructionPointer > objectMemory startOfMemory].
self assert: primFailCode = 0.
jmpDepth := jmpDepth-1.
^true!
Item was changed:
----- Method: CoInterpreter>>flushExternalPrimitiveOf: (in category 'plugin primitive support') -----
flushExternalPrimitiveOf: methodObj
"methodObj is a CompiledMethod containing an external primitive.
Flush the function address and session ID of the CM. Override
to also flush the machine code call if one exists."
<api>
super flushExternalPrimitiveOf: methodObj.
(self methodHasCogMethod: methodObj) ifTrue:
[cogit
rewritePrimInvocationIn: (self cogMethodOf: methodObj)
+ to: #primitiveExternalCall]!
- to: #primitiveExternalCall asSymbol]!
Item was changed:
----- Method: CoInterpreter>>functionForPrimitiveExternalCall: (in category 'plugin primitives') -----
functionForPrimitiveExternalCall: methodObj
"Arrange to call the external primitive directly. The complication is arranging
that the call can be flushed, given that it is embedded in machine code."
<returnTypeC: 'void (*functionForPrimitiveExternalCall(sqInt methodObj))(void)'>
| lit index functionPointer |
<var: #functionPointer declareC: #'void (*functionPointer)(void)'>
+ cogit setPostCompileHook: #recordCallOffsetIn:of:.
- cogit setPostCompileHook: #recordCallOffsetIn:of: asSymbol.
(self literalCountOf: methodObj) > 0 ifFalse:
+ [^#primitiveExternalCall].
- [^#primitiveExternalCall asSymbol].
lit := self literal: 0 ofMethod: methodObj.
"Check if it's an array of length 4"
((objectMemory isArray: lit) and: [(objectMemory lengthOf: lit) = 4]) ifFalse:
+ [^#primitiveExternalCall].
- [^#primitiveExternalCall asSymbol].
index := objectMemory fetchPointer: 3 ofObject: lit.
((objectMemory isIntegerObject: index)
and: [(index := objectMemory integerValueOf: index) > 0
and: [index <= MaxExternalPrimitiveTableSize]]) ifFalse:
+ [^#primitiveExternalCall].
- [^#primitiveExternalCall asSymbol].
functionPointer := externalPrimitiveTable at: index - 1.
functionPointer = 0 ifTrue:
+ [^#primitiveExternalCall].
- [^#primitiveExternalCall asSymbol].
^functionPointer!
Item was changed:
----- Method: CoInterpreter>>functionPointerForCompiledMethod:primitiveIndex: (in category 'cog jit support') -----
functionPointerForCompiledMethod: methodObj primitiveIndex: primIndex
<api>
<returnTypeC: 'void (*functionPointerForCompiledMethodprimitiveIndex(sqInt methodObj, sqInt primIndex))(void)'>
| functionPointer |
<var: #functionPointer declareC: #'void (*functionPointer)(void)'>
functionPointer := self functionPointerFor: primIndex inClass: nil.
+ functionPointer == #primitiveAt ifTrue:
+ [^#primitiveNoAtCacheAt].
+ functionPointer == #primitiveAtPut ifTrue:
+ [^#primitiveNoAtCacheAtPut].
+ functionPointer == #primitiveStringAt ifTrue:
+ [^#primitiveNoAtCacheStringAt].
+ functionPointer == #primitiveStringAtPut ifTrue:
+ [^#primitiveNoAtCacheStringAtPut].
+ functionPointer == #primitiveCalloutToFFI ifTrue:
- functionPointer == #primitiveAt asSymbol ifTrue:
- [^#primitiveNoAtCacheAt asSymbol].
- functionPointer == #primitiveAtPut asSymbol ifTrue:
- [^#primitiveNoAtCacheAtPut asSymbol].
- functionPointer == #primitiveStringAt asSymbol ifTrue:
- [^#primitiveNoAtCacheStringAt asSymbol].
- functionPointer == #primitiveStringAtPut asSymbol ifTrue:
- [^#primitiveNoAtCacheStringAtPut asSymbol].
- functionPointer == #primitiveCalloutToFFI asSymbol ifTrue:
[^self functionForPrimitiveCallout].
+ functionPointer == #primitiveExternalCall ifTrue:
- functionPointer == #primitiveExternalCall asSymbol ifTrue:
[^self functionForPrimitiveExternalCall: methodObj].
^functionPointer!
Item was changed:
----- Method: CoInterpreter>>interpretAddress (in category 'trampoline support') -----
interpretAddress
"This is used for asserts that check that inline cache editing results in valid addresses.
In the C VM interpret is presumed to come before any primitives and so it constitutes
the lowest address in C code that machine code should be linked. In the simulator
we just answer something not low."
<api>
<returnTypeC: #usqInt>
+ ^self cCode: [(self addressOf: #interpret) asUnsignedInteger]
- ^self cCode: [(self addressOf: #interpret asSymbol) asUnsignedInteger]
inSmalltalk: [heapBase]!
Item was changed:
----- Method: CoInterpreter>>interpretMethodFromMachineCode (in category 'message sending') -----
interpretMethodFromMachineCode
"Execute a method interpretively from machine code. We assume (require) that newMethod
messageSelector, primitiveFunctionPointer and argumentCount have been set in the caller.
Once evaluated either continue in the interpreter via a jongjmp or in machine code via an
enilopmart (a form of longjmp - a stinking rose by any other name)."
<inline: false>
cogit assertCStackWellAligned.
self assert: (self validInstructionPointer: instructionPointer inFrame: framePointer).
primitiveFunctionPointer ~= 0
ifTrue:
+ [primitiveFunctionPointer = #primitiveInvokeObjectAsMethod
- [primitiveFunctionPointer = #primitiveInvokeObjectAsMethod asSymbol
ifTrue: [self assert: (objectMemory isOopCompiledMethod: newMethod) not]
ifFalse: [self assert: ((objectMemory isOopCompiledMethod: newMethod)
and: [(self primitiveIndexOf: newMethod) ~= 0])].
"Invoke an interpreter primitive (because the method is to be interpreted or has not yet been
compiled). This is very similar to invoking an interpreter primitive from a compiled primitive
(see e.g. SimpleStackBasedCogit>>compileInterpreterPrimitive:). Cut back the stack pointer
(done above) to skip the return address and invoke the function. On return if it has succeeded
simply continue otherwise restore the stackPointer, collect the pc and interpret. Note that
frame building primitives such as primitiveClosureValue, primitiveEvaluateMethod et al will not
return but will instead jump into either machine code or longjmp back to the interpreter."
"Assign stackPage headFP so we can tell if the primitive built a frame. We can't simply save
the framePointer since e.g. assignment to contexts (via primitiveInstVarAt:put:) can change the
framePointer. But context assignments will change both the framePointer and stackPage headFP."
stackPage headFP: framePointer.
self isPrimitiveFunctionPointerAnIndex
ifTrue:
[self externalQuickPrimitiveResponse.
primFailCode := 0]
ifFalse:
[self slowPrimitiveResponse].
self successful ifTrue:
[self return: self popStack toExecutive: false
"NOTREACHED"]]
ifFalse:
[self assert: ((objectMemory isOopCompiledMethod: newMethod)
and: [(self primitiveIndexOf: newMethod) = 0
or: [(self functionPointerFor: (self primitiveIndexOf: newMethod) inClass: objectMemory nilObject) = 0
or: [self isNullExternalPrimitiveCall: newMethod]]])].
"if not primitive, or primitive failed, activate the method and reenter the interpreter"
self activateNewMethod.
self siglong: reenterInterpreter jmp: ReturnToInterpreter.
"NOTREACHED"
^nil!
Item was changed:
----- Method: CoInterpreter>>primitiveFailAddress (in category 'trampoline support') -----
primitiveFailAddress
"This is used for asserts that check that inline cache editing results in valid addresses.
In the C VM interpret is presumed to come before any primitives and so it constitutes
the lowest address in C code that machine code should be linked, but optimizing
compilers change things around. In the simulator we just answer something not low."
<api>
<returnTypeC: #usqInt>
+ ^self cCode: [(self addressOf: #primitiveFail) asUnsignedInteger]
- ^self cCode: [(self addressOf: #primitiveFail asSymbol) asUnsignedInteger]
inSmalltalk: [heapBase]!
Item was changed:
----- Method: CoInterpreter>>primitivePropertyFlags: (in category 'cog jit support') -----
primitivePropertyFlags: primIndex
<api>
"Answer any special requirements of the given primitive"
| baseFlags functionPointer |
<var: #functionPointer declareC: 'void (*functionPointer)(void)'>
functionPointer := self functionPointerFor: primIndex inClass: nil.
baseFlags := profileSemaphore ~= objectMemory nilObject
ifTrue: [PrimCallNeedsNewMethod + PrimCallCollectsProfileSamples]
ifFalse: [0].
longRunningPrimitiveCheckSemaphore ~= nil ifTrue:
[baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod].
+ (functionPointer == #primitiveExternalCall
+ or: [functionPointer == #primitiveCalloutToFFI]) ifTrue: "For callbacks"
- (functionPointer == #primitiveExternalCall asSymbol
- or: [functionPointer == #primitiveCalloutToFFI asSymbol]) ifTrue: "For callbacks"
[baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod + PrimCallNeedsPrimitiveFunction + PrimCallMayCallBack].
^baseFlags!
Item was changed:
----- Method: CoInterpreter>>quickPrimitiveGeneratorFor: (in category 'cog jit support') -----
quickPrimitiveGeneratorFor: aQuickPrimitiveIndex
<api>
<returnTypeC: 'int (*quickPrimitiveGeneratorFor(sqInt aQuickPrimitiveIndex))(void)'>
^aQuickPrimitiveIndex
caseOf: {
+ [256] -> [#genQuickReturnSelf].
+ [257] -> [#genQuickReturnConst].
+ [258] -> [#genQuickReturnConst].
+ [259] -> [#genQuickReturnConst].
+ [260] -> [#genQuickReturnConst].
+ [261] -> [#genQuickReturnConst].
+ [262] -> [#genQuickReturnConst].
+ [263] -> [#genQuickReturnConst] }
+ otherwise: [#genQuickReturnInstVar]!
- [256] -> [#genQuickReturnSelf asSymbol].
- [257] -> [#genQuickReturnConst asSymbol].
- [258] -> [#genQuickReturnConst asSymbol].
- [259] -> [#genQuickReturnConst asSymbol].
- [260] -> [#genQuickReturnConst asSymbol].
- [261] -> [#genQuickReturnConst asSymbol].
- [262] -> [#genQuickReturnConst asSymbol].
- [263] -> [#genQuickReturnConst asSymbol] }
- otherwise: [#genQuickReturnInstVar asSymbol]!
Item was changed:
----- Method: CoInterpreter>>restoreCStackStateForCallbackContext: (in category 'callback support') -----
restoreCStackStateForCallbackContext: vmCallbackContext
<var: #vmCallbackContext type: #'VMCallbackContext *'>
cogit
setCStackPointer: vmCallbackContext savedCStackPointer;
setCFramePointer: vmCallbackContext savedCFramePointer.
self mem: reenterInterpreter
cp: (self cCoerceSimple: vmCallbackContext savedReenterInterpreter to: #'void *')
+ y: (self sizeof: #'jmp_buf')!
- y: (self sizeof: #'jmp_buf' asSymbol)!
Item was changed:
----- Method: CoInterpreter>>rewriteMethodCacheEntryForExternalPrimitiveToFunction: (in category 'method lookup cache') -----
rewriteMethodCacheEntryForExternalPrimitiveToFunction: localPrimAddress
"Rewrite an existing entry in the method cache with a new primitive function address.
Used by primitiveExternalCall to make direct calls to found external prims, or quickly
fail not found external prims.
Override to do the same to the machine code call. If methodObj has a cogged dual
rewrite the primitive call in it to call localPrimAddress. Used to update calls through
primitiveExternalCall to directly call the target function or to revert to calling
primitiveExternalCall after a flush."
<var: #localPrimAddress declareC: 'void (*localPrimAddress)(void)'>
<inline: false>
(self methodHasCogMethod: newMethod) ifTrue:
[cogit
rewritePrimInvocationIn: (self cogMethodOf: newMethod)
to: (localPrimAddress = 0
+ ifTrue: [self cCoerceSimple: #primitiveFail to: #'void (*)(void)']
- ifTrue: [self cCoerceSimple: #primitiveFail asSymbol to: #'void (*)(void)']
ifFalse: [localPrimAddress])].
(methodCache at: lastMethodCacheProbeWrite + MethodCacheMethod) = newMethod ifTrue:
[methodCache
at: lastMethodCacheProbeWrite + MethodCachePrimFunction
put: (self cCoerce: localPrimAddress to: #long)]!
Item was changed:
----- Method: CoInterpreter>>saveCStackStateForCallbackContext: (in category 'callback support') -----
saveCStackStateForCallbackContext: vmCallbackContext
<var: #vmCallbackContext type: #'VMCallbackContext *'>
vmCallbackContext
savedCStackPointer: cogit getCStackPointer;
savedCFramePointer: cogit getCFramePointer.
self mem: (self cCoerceSimple: vmCallbackContext savedReenterInterpreter to: #'void *')
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf')!
- y: (self sizeof: #'jmp_buf' asSymbol)!
Item was changed:
----- Method: CoInterpreterMT>>ownVM: (in category 'vm scheduling') -----
ownVM: threadIndexAndFlags
<api>
<inline: false>
"This is the entry-point for plugins and primitives that wish to reacquire the VM after having
released it via disownVM or callbacks that want to acquire it without knowing their ownership
status. This call will block until the VM is owned by the current thread or an error occurs.
The argument should be the value answered by disownVM, or 0 for callbacks that don't know
if they have disowned or not. This is both an optimization to avoid having to query thread-
local storage for the current thread's index (since it can easily keep it in some local variable),
and a record of when an unbound process becomes affined to a thread for the dynamic
extent of some operation.
Answer 0 if the current thread is known to the VM.
Answer 1 if the current thread is unknown to the VM and takes ownership.
Answer -1 if the current thread is unknown to the VM and fails to take ownership."
| threadIndex flags vmThread myProc activeProc sched |
<var: #vmThread type: #'CogVMThread *'>
threadIndexAndFlags = 0 ifTrue:
[^self ownVMFromUnidentifiedThread].
threadIndex := threadIndexAndFlags bitAnd: ThreadIdMask.
flags := threadIndexAndFlags >> DisownFlagsShift.
(flags anyMask: DisownVMForProcessorRelinquish) ifTrue:
[relinquishing := false.
self sqLowLevelMFence].
(threadIndexAndFlags anyMask: LockGUIThreadFlag) ifTrue:
[self assert: (noThreadingOfGUIThread and: [self inGUIThread]).
self assert: disowningVMThread = nil.
(flags anyMask: DisownVMLockOutFullGC) ifTrue:
[objectMemory decrementFullGCLock].
cogit recordEventTrace ifTrue:
[self recordTrace: TraceOwnVM thing: ConstZero source: 0].
^0].
vmThread := cogThreadManager acquireVMFor: threadIndex.
disownCount := disownCount - 1.
(flags anyMask: DisownVMLockOutFullGC) ifTrue:
[objectMemory decrementFullGCLock].
disowningVMThread notNil ifTrue:
[vmThread = disowningVMThread ifTrue:
[self cCode: ''
inSmalltalk:
[| range |
range := self cStackRangeForThreadIndex: threadIndex.
self assert: (range includes: cogit getCStackPointer).
self assert: (range includes: cogit getCFramePointer)].
self assert: self successful.
self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject.
disowningVMThread := nil.
cogit recordEventTrace ifTrue:
[self recordTrace: TraceOwnVM thing: ConstOne source: 0].
^0]. "if not preempted we're done."
self preemptDisowningThread].
"We've been preempted; we must restore state and update the threadId
in our process, and may have to put the active process to sleep."
activeProc := self activeProcess.
(threadIndexAndFlags anyMask: OwnVMForeignThreadFlag)
ifTrue:
[self assert: foreignCallbackProcessSlot == ForeignCallbackProcess.
myProc := objectMemory splObj: foreignCallbackProcessSlot.
self assert: myProc ~= objectMemory nilObject.
objectMemory splObj: foreignCallbackProcessSlot put: objectMemory nilObject]
ifFalse: [myProc := cogThreadManager popAWOLProcess: vmThread].
self assert: activeProc ~= myProc.
(activeProc ~= objectMemory nilObject
and: [(objectMemory fetchPointer: MyListIndex ofObject: activeProc) = objectMemory nilObject]) ifTrue:
[self putToSleep: activeProc yieldingIf: preemptionYields].
self assert: (objectMemory fetchPointer: MyListIndex ofObject: myProc) = (objectMemory splObj: ProcessInExternalCodeTag).
sched := self schedulerPointer.
objectMemory
storePointer: ActiveProcessIndex ofObject: sched withValue: myProc;
storePointerUnchecked: MyListIndex ofObject: myProc withValue: objectMemory nilObject.
"Only unaffine if the process was affined at this level and did not become bound in the interim."
((threadIndexAndFlags anyMask: ProcessUnaffinedOnDisown)
and: [(self isBoundProcess: myProc) not]) ifTrue:
[self setOwnerIndexOfProcess: myProc to: 0 bind: false].
self initPrimCall.
self externalSetStackPageAndPointersForSuspendedContextOfProcess: myProc.
"If this primitive is called from machine code maintain the invariant that the return pc
of an interpreter callee calling a machine code caller is ceReturnToInterpreterPC."
instructionPointer := self popStack.
(vmThread inMachineCode
and: [instructionPointer >= objectMemory startOfMemory]) ifTrue:
[self iframeSavedIP: framePointer put: instructionPointer.
instructionPointer := cogit ceReturnToInterpreterPC].
newMethod := vmThread newMethodOrNull.
argumentCount := vmThread argumentCount.
self cCode:
[self mem: reenterInterpreter
cp: vmThread reenterInterpreter
+ y: (self sizeof: #'jmp_buf')]
- y: (self sizeof: #'jmp_buf' asSymbol)]
inSmalltalk:
[reenterInterpreter := vmThread reenterInterpreter].
vmThread newMethodOrNull: nil.
self cCode: ''
inSmalltalk:
[| range |
range := self cStackRangeForThreadIndex: threadIndex.
self assert: (range includes: vmThread cStackPointer).
self assert: (range includes: vmThread cFramePointer)].
cogit setCStackPointer: vmThread cStackPointer.
cogit setCFramePointer: vmThread cFramePointer.
self assert: newMethod ~~ nil..
cogit recordEventTrace ifTrue:
[self recordTrace: TraceOwnVM thing: ConstTwo source: 0].
^threadIndexAndFlags bitAnd: OwnVMForeignThreadFlag!
Item was changed:
----- Method: CoInterpreterMT>>preemptDisowningThread (in category 'vm scheduling') -----
preemptDisowningThread
"Set the relevant state for disowningVMThread so that it can resume after
being preempted and set disowningVMThread to nil to indicate preemption.
N.B. This should only be sent from checkPreemptionOfDisowningThread.
There are essentially four things to do.
a) save the VM's notion of the current C stack pointers; these are pointers
into a thread's stack and must be saved and restored in thread switch.
b) save the VM's notion of the current Smalltalk execution point. This is
simply the suspend half of a process switch that saves the current context
in the current process.
c) add the process to the thread's set of AWOL processes so that the scheduler
won't try to run the process while the thread has disowned the VM.
d) save the in-primitive VM state, newMethod and argumentCount
ownVM: will restore the VM context as of disownVM: from the above when it
finds it has been preempted."
| activeProc activeContext preemptedThread |
<var: #preemptedThread type: #'CogVMThread *'>
<inline: false>
self assert: disowningVMThread notNil.
self assert: (disowningVMThread state = CTMUnavailable
or: [disowningVMThread state = CTMWantingOwnership]).
self cCode: ''
inSmalltalk:
[| range |
range := self cStackRangeForThreadIndex: disowningVMThread index.
self assert: (range includes: cogit getCStackPointer).
self assert: (range includes: cogit getCFramePointer)].
cogit recordEventTrace ifTrue:
[self recordTrace: TracePreemptDisowningThread
thing: (objectMemory integerObjectOf: disowningVMThread index)
source: 0].
disowningVMThread cStackPointer: cogit getCStackPointer.
disowningVMThread cFramePointer: cogit getCFramePointer.
activeProc := self activeProcess.
self assert: (objectMemory fetchPointer: MyListIndex ofObject: activeProc) = objectMemory nilObject.
objectMemory
storePointer: MyListIndex
ofObject: activeProc
withValue: (objectMemory splObj: ProcessInExternalCodeTag).
"The instructionPointer must be pushed because the convention for inactive stack pages is that the
instructionPointer is top of stack. We need to know if this primitive is called from machine code
because the invariant that the return pc of an interpreter callee calling a machine code caller is
ceReturnToInterpreterPC must be maintained."
self push: instructionPointer.
self externalWriteBackHeadFramePointers.
activeContext := self ensureFrameIsMarried: framePointer SP: stackPointer.
objectMemory
storePointer: SuspendedContextIndex
ofObject: activeProc
withValue: activeContext.
"Since pushing the awol process may realloc disowningVMThread we need to reassign.
But since we're going to nil disowningVMThread anyway we can assign to a local."
preemptedThread := cogThreadManager pushAWOLProcess: activeProc on: disowningVMThread.
disowningVMThread := nil.
preemptedThread priority: (self quickFetchInteger: PriorityIndex ofObject: activeProc).
(self ownerIndexOfProcess: activeProc) = 0
ifTrue: [self setOwnerIndexOfProcess: activeProc to: preemptedThread index bind: false]
ifFalse: [self assert: (self ownerIndexOfProcess: activeProc) = preemptedThread index].
preemptedThread
newMethodOrNull: newMethod;
argumentCount: argumentCount;
inMachineCode: instructionPointer asUnsignedInteger <= objectMemory startOfMemory.
self cCode:
[self mem: preemptedThread reenterInterpreter
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf')]
- y: (self sizeof: #'jmp_buf' asSymbol)]
inSmalltalk:
[preemptedThread reenterInterpreter: reenterInterpreter]!
Item was changed:
----- Method: CoInterpreterMT>>primitiveRelinquishProcessor (in category 'I/O primitives') -----
primitiveRelinquishProcessor
"Relinquish the processor for up to the given number of microseconds.
The exact behavior of this primitive is platform dependent.
Override to check for waiting threads."
| microSecs threadIndexAndFlags currentCStackPointer currentCFramePointer savedReenterInterpreter |
<var: #currentCStackPointer type: #'void *'>
<var: #currentCFramePointer type: #'void *'>
<var: #savedReenterInterpreter type: #'jmp_buf'>
microSecs := self stackTop.
(objectMemory isIntegerObject: microSecs) ifFalse:
[^self primitiveFail].
self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject.
self assert: relinquishing not.
"DO NOT allow relinquishing the processor while we are profiling since this
may skew the time base for our measures (it may reduce processor speed etc).
Instead we go full speed, therefore measuring the precise time we spend in the
inner idle loop as a busy loop."
nextProfileTick = 0 ifTrue:
"Presumably we have nothing to do; this primitive is typically called from the
background process. So we should /not/ try and activate any threads in the
pool; they will waste cycles finding there is no runnable process, and will
cause a VM abort if no runnable process is found. But we /do/ want to allow
FFI calls that have completed, or callbacks a chance to get into the VM; they
do have something to do. DisownVMForProcessorRelinquish indicates this."
[currentCStackPointer := cogit getCStackPointer.
currentCFramePointer := cogit getCFramePointer.
self cCode:
[self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf')].
- y: (self sizeof: #'jmp_buf' asSymbol)].
threadIndexAndFlags := self disownVM: DisownVMForProcessorRelinquish.
self assert: relinquishing.
self ioRelinquishProcessorForMicroseconds: (objectMemory integerValueOf: microSecs).
self assert: relinquishing.
self ownVM: threadIndexAndFlags.
self assert: relinquishing not.
self assert: cogThreadManager currentVMThread state = CTMAssignableOrInVM.
self assert: currentCStackPointer = cogit getCStackPointer.
self assert: currentCFramePointer = cogit getCFramePointer.
self cCode:
[self assert: (self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
cm: reenterInterpreter
+ p: (self sizeof: #'jmp_buf')) = 0]].
- p: (self sizeof: #'jmp_buf' asSymbol)) = 0]].
self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject.
self pop: 1 "microSecs; leave rcvr on stack"!
Item was changed:
----- Method: CoInterpreterMT>>returnToSchedulingLoopAndReleaseVMOrWakeThread:source: (in category 'process primitive support') -----
returnToSchedulingLoopAndReleaseVMOrWakeThread: vmThread source: source
| savedReenterInterpreter |
<var: #savedReenterInterpreter type: #'jmp_buf'>
<var: #vmThread type: #'CogVMThread *'>
<inline: false>
self cCode:
[self flag: 'this is just for debugging. Note the current C stack pointers'.
cogThreadManager currentVMThread
cStackPointer: cogit getCStackPointer;
cFramePointer: cogit getCFramePointer]
inSmalltalk:
[| range |
range := self cStackRangeForThreadIndex: cogThreadManager getVMOwner.
self assert: (range includes: cogit getCStackPointer).
self assert: (range includes: cogit getCFramePointer)].
"We must use a copy of reenterInterpreter since we're giving up the VM to another vmThread."
self cCode:
[self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *')
cp: reenterInterpreter
+ y: (self sizeof: #'jmp_buf')]
- y: (self sizeof: #'jmp_buf' asSymbol)]
inSmalltalk:
[savedReenterInterpreter := reenterInterpreter].
self recordThreadSwitchTo: (vmThread ifNotNil: [vmThread index] ifNil: [0]) source: source.
vmThread
ifNotNil: [cogThreadManager wakeVMThreadFor: vmThread index]
ifNil: [cogThreadManager releaseVM].
"2 implies returning to the threadSchedulingLoop."
self siglong: savedReenterInterpreter jmp: ReturnToThreadSchedulingLoop!
Item was changed:
----- Method: CogObjectRepresentationForSqueakV3>>genAllocFloatValue:into:scratchReg:scratchReg: (in category 'compile abstract instructions') -----
genAllocFloatValue: dpreg into: resultReg scratchReg: scratch1 scratchReg: scratch2
<returnTypeC: #'AbstractInstruction *'>
| allocSize newFloatHeaderSansHash jumpFail |
<var: #jumpFail type: #'AbstractInstruction *'>
+ allocSize := BaseHeaderSize + (objectMemory sizeof: #double).
- allocSize := BaseHeaderSize + (objectMemory sizeof: #double asSymbol).
newFloatHeaderSansHash := ((objectMemory classFloatCompactIndex << objectMemory compactClassFieldLSB
bitOr: (objectMemory formatOfClass: objectMemory classFloat))
bitOr: allocSize)
bitOr: HeaderTypeShort.
cogit MoveAw: objectMemory freeStartAddress R: resultReg.
cogit MoveR: resultReg R: scratch1.
cogit AddCq: allocSize R: scratch1.
cogit MoveAw: objectMemory scavengeThresholdAddress R: scratch2.
cogit CmpR: scratch2 R: scratch1.
jumpFail := cogit JumpAboveOrEqual: 0.
cogit MoveR: resultReg R: scratch2.
self flag: #newObjectHash.
cogit AndCq: HashMaskUnshifted << BytesPerWord R: scratch2.
cogit LogicalShiftLeftCq: HashBitsOffset - BytesPerWord R: scratch2.
cogit OrCq: newFloatHeaderSansHash R: scratch2.
cogit MoveR: scratch2 Mw: 0 r: resultReg.
cogit MoveRd: dpreg M64: BaseHeaderSize r: resultReg.
cogit MoveR: scratch1 Aw: objectMemory freeStartAddress.
^jumpFail!
Item was changed:
----- Method: CogObjectRepresentationForSqueakV3>>genStoreCheckTrampoline (in category 'initialization') -----
genStoreCheckTrampoline
"Call noteAsRoot: with the object stored into"
^cogit
+ genTrampolineFor: #ceStoreCheck:
- genTrampolineFor: #ceStoreCheck: asSymbol
called: 'ceStoreCheckTrampoline'
arg: ReceiverResultReg
result: cogit returnRegForStoreCheck!
Item was changed:
----- Method: CogThreadManager>>startThreadForThreadInfo: (in category 'scheduling') -----
startThreadForThreadInfo: vmThread
<var: #vmThread type: #'CogVMThread *'>
<inline: false>
self assert: vmThread state isNil.
vmThread state: CTMInitializing.
"self cCode: ''
inSmalltalk: [coInterpreter transcript
cr;
nextPutAll: 'starting VM thread ';
print: vmThread index;
flush.
(thisContext home stackOfSize: 10) do:
[:ctxt|
coInterpreter transcript cr; print: ctxt; flush]]."
+ (self ioNewOS: #startVMThread: Thread: vmThread) = 0 ifTrue:
- (self ioNewOS: #startVMThread: asSymbol Thread: vmThread) = 0 ifTrue:
[self ioTransferTimeslice.
^true].
memoryIsScarce := true.
"self cCode: [coInterpreter print: 'ERVT failed to spawn so memory is scarce'; cr]"
^false!
Item was changed:
----- Method: CogVMSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') -----
ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength
"Load and return the requested function from a module"
| pluginString functionString |
pluginString := String new: moduleLength.
1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)].
functionString := String new: functionLength.
1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)].
- functionString := functionString asSymbol.
^self ioLoadFunction: functionString From: pluginString!
Item was changed:
----- Method: CogVMSimulator>>rewriteMethodCacheEntryForExternalPrimitiveToFunction: (in category 'method lookup cache') -----
rewriteMethodCacheEntryForExternalPrimitiveToFunction: localPrimAddress
super rewriteMethodCacheEntryForExternalPrimitiveToFunction:
(self mapFunctionToAddress: (localPrimAddress = 0
+ ifTrue: [#primitiveFail]
- ifTrue: [#primitiveFail asSymbol]
ifFalse: [localPrimAddress])).
"Hack; the super call will rewrite the entry to the address of the function.
So (when simulating) undo the damage and put back the functionPointer"
(methodCache at: lastMethodCacheProbeWrite + MethodCacheMethod) = newMethod ifTrue:
[methodCache
at: lastMethodCacheProbeWrite + MethodCachePrimFunction
put: (self cCoerce: localPrimAddress to: #long)]!
Item was changed:
----- Method: Cogit>>allMachineCodeObjectReferencesValid (in category 'garbage collection') -----
allMachineCodeObjectReferencesValid
"Check that all methods have valid selectors, and that all linked sends are to valid targets and have valid cache tags"
| ok cogMethod |
<var: #cogMethod type: #'CogMethod *'>
ok := true.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType ~= CMFree ifTrue:
[(self asserta: (objectRepresentation checkValidObjectReference: cogMethod selector)) ifFalse:
[ok := false].
(self asserta: (self cogMethodDoesntLookKosher: cogMethod) = 0) ifFalse:
[ok := false]].
(cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]) ifTrue:
[(self asserta: ((self mapFor: cogMethod
+ performUntil: #checkIfValidObjectRefAndTarget:pc:cogMethod:
- performUntil: #checkIfValidObjectRefAndTarget:pc:cogMethod: asSymbol
arg: cogMethod asInteger) = 0)) ifFalse:
[ok := false]].
cogMethod cmType = CMClosedPIC ifTrue:
[(self asserta: (self noTargetsFreeInClosedPIC: cogMethod)) ifFalse:
[ok := false]].
cogMethod := methodZone methodAfter: cogMethod].
^ok!
Item was changed:
----- Method: Cogit>>bytecodePCFor:startBcpc:in: (in category 'method map') -----
bytecodePCFor: mcpc startBcpc: startbcpc in: cogMethod
"Answer the zero-relative bytecode pc matching the machine code pc argument in
cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogBlockMethod *'>
^self
mapFor: cogMethod
bcpc: startbcpc
+ performUntil: #findMcpc:Bcpc:MatchingMcpc:
- performUntil: #findMcpc:Bcpc:MatchingMcpc: asSymbol
arg: (self cCoerceSimple: mcpc to: #'void *')!
Item was changed:
----- Method: Cogit>>checkIntegrityOfObjectReferencesInCode: (in category 'debugging') -----
checkIntegrityOfObjectReferencesInCode: fullGCFlag
<api>
"Answer if all references to objects in machine-code are valid."
| cogMethod ok count |
<var: #cogMethod type: #'CogMethod *'>
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
ok := true.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType ~= CMFree ifTrue:
[cogMethod cmRefersToYoung ifTrue:
[(count := methodZone occurrencesInYoungReferrers: cogMethod) ~= 1 ifTrue:
[self print: 'young referrer CM '; printHex: cogMethod asInteger.
count = 0
ifTrue: [self print: ' is not in youngReferrers'; cr]
ifFalse: [self print: ' is in youngReferrers '; printNum: count; print: ' times!!'; cr].
ok := false]].
(objectRepresentation checkValidObjectReference: cogMethod selector) ifFalse:
[self print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' selector'; cr.
ok := false].
cogMethod cmType = CMMethod
ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
(objectRepresentation checkValidObjectReference: cogMethod methodObject) ifFalse:
[self print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr.
ok := false].
(self mapFor: cogMethod
+ performUntil: #checkIfValidObjectRef:pc:cogMethod:
- performUntil: #checkIfValidObjectRef:pc:cogMethod: asSymbol
arg: cogMethod asInteger) ~= 0
ifTrue: [ok := false].
fullGCFlag ifFalse:
[(((objectMemory isYoung: cogMethod methodObject)
or: [objectMemory isYoung: cogMethod selector])
and: [cogMethod cmRefersToYoung not]) ifTrue:
[self print: 'CM '; printHex: cogMethod asInteger; print: ' refers to young but not marked as such'; cr.
ok := false]]]
ifFalse:
[cogMethod cmType = CMClosedPIC
ifTrue:
[(self checkValidObjectReferencesInClosedPIC: cogMethod) ifFalse:
[ok := false]]
ifFalse:
[cogMethod cmType = CMOpenPIC
ifTrue:
[(self mapFor: cogMethod
+ performUntil: #checkIfValidObjectRef:pc:cogMethod:
- performUntil: #checkIfValidObjectRef:pc:cogMethod: asSymbol
arg: cogMethod asInteger) ~= 0
ifTrue: [ok := false]]]]].
cogMethod := methodZone methodAfter: cogMethod].
^ok!
Item was changed:
----- Method: Cogit>>disassembleMethod:on: (in category 'disassembly') -----
disassembleMethod: surrogateOrAddress on: aStream
<doNotGenerate>
| cogMethod mapEntries codeRanges |
cogMethod := surrogateOrAddress isInteger
ifTrue: [self cogMethodSurrogateAt: surrogateOrAddress]
ifFalse: [surrogateOrAddress].
cogMethod cmType = CMBlock ifTrue:
[^self disassembleMethod: cogMethod cmHomeMethod on: aStream].
self printMethodHeader: cogMethod on: aStream.
(mapEntries := Dictionary new)
at: cogMethod asInteger + cmEntryOffset put: 'entry'.
cogMethod cmType = CMMethod ifTrue:
[mapEntries at: cogMethod asInteger + cmNoCheckEntryOffset put: 'noCheckEntry'.
self cppIf: NewspeakVM
ifTrue: [mapEntries at: cogMethod asInteger + dynSuperEntryAlignment put: 'dynSuperEntry']].
cogMethod cmType = CMClosedPIC ifTrue:
[mapEntries at: cogMethod asInteger + firstCPICCaseOffset put: 'ClosedPICCase0'.
1 to: numPICCases - 1 do:
[:i|
mapEntries
at: cogMethod asInteger + firstCPICCaseOffset + (i * cPICCaseSize)
put: 'ClosedPICCase', i printString]].
self mapFor: cogMethod
+ performUntil: #collectMapEntry:address:into:
- performUntil: #collectMapEntry:address:into: asSymbol
arg: mapEntries.
"This would all be far more elegant and simple if we used blocks.
But there are no blocks in C and the basic enumerators here need
to be used in the real VM. Apologies."
(codeRanges := self codeRangesFor: cogMethod) do:
[:range|
(cogMethod cmType = CMMethod) ifTrue:
[mapEntries keysAndValuesDo:
[:mcpc :label| | bcpc |
((range includes: mcpc)
and: [#(IsSendCall HasBytecodePC) includes: label]) ifTrue:
[bcpc := self bytecodePCFor: mcpc startBcpc: range startpc in: range cogMethod.
bcpc ~= 0 ifTrue:
[mapEntries at: mcpc put: label, ' bc ', bcpc printString, '/', (bcpc + 1) printString]]]].
(cogMethod blockEntryOffset ~= 0
and: [range first = (cogMethod blockEntryOffset + cogMethod asInteger)])
ifTrue:
[aStream nextPutAll: 'blockEntry:'; cr.
self blockDispatchFor: cogMethod
perform: #disassemble:from:to:arg:
arg: aStream]
ifFalse:
[range first > (cogMethod address + cmNoCheckEntryOffset) ifTrue:
[self printMethodHeader: range cogMethod
on: aStream].
self disassembleFrom: range first to: range last labels: mapEntries on: aStream]].
aStream nextPutAll: 'startpc: '; print: codeRanges first startpc; cr.
(cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]) ifTrue:
[[self mapFor: cogMethod
performUntil: #printMapEntry:mcpc:args:
arg: { aStream. codeRanges. cogMethod }]
on: AssertionFailure
do: [:ex|
ex primitiveChangeClassTo: ResumableVMError basicNew. ":) :) :)"
ex resume: nil]].
^cogMethod!
Item was changed:
----- Method: Cogit>>findEnclosingMethodFor:inHomeMethod: (in category 'method map') -----
findEnclosingMethodFor: mcpc inHomeMethod: cogMethod
<var: #cogMethod type: #'CogMethod *'>
<returnTypeC: #'CogBlockMethod *'>
<api>
"Find the CMMethod or CMBlock that encloses mcpc.
If the method contains blocks then, because block dispatch is not in order,
enumerate the block dispatch and find the nearest preceeding entry."
self assert: cogMethod cmType = CMMethod.
cogMethod blockEntryOffset = 0 ifTrue:
[^self cCoerceSimple: cogMethod to: #'CogBlockMethod *'].
maxMethodBefore := self cCoerceSimple: cogMethod to: #'CogBlockMethod *'.
+ self blockDispatchTargetsFor: cogMethod perform: #findMinAndMaxMethodsPC:around: arg: mcpc.
- self blockDispatchTargetsFor: cogMethod perform: #findMinAndMaxMethodsPC:around: asSymbol arg: mcpc.
^maxMethodBefore!
Item was changed:
----- Method: Cogit>>findMethodForStartBcpc:inHomeMethod: (in category 'method map') -----
findMethodForStartBcpc: startbcpc inHomeMethod: cogMethod
<api>
<var: #cogMethod type: #'CogMethod *'>
<returnTypeC: #'CogBlockMethod *'>
"Find the CMMethod or CMBlock that has zero-relative startbcpc as its first bytecode pc.
As this is for cannot resume processing and/or conversion to machine-code on backward
branch, it doesn't have to be fast. Enumerate block returns and map to bytecode pcs."
self assert: cogMethod cmType = CMMethod.
startbcpc = (coInterpreter startPCOfMethodHeader: cogMethod methodHeader) ifTrue:
[^self cCoerceSimple: cogMethod to: #'CogBlockMethod *'].
self assert: cogMethod blockEntryOffset ~= 0.
^self cCoerceSimple: (self blockDispatchTargetsFor: cogMethod
+ perform: #findBlockMethodWithEntry:startBcpc:
- perform: #findBlockMethodWithEntry:startBcpc: asSymbol
arg: startbcpc)
to: #'CogBlockMethod *'!
Item was changed:
----- Method: Cogit>>genActiveContextTrampoline (in category 'initialization') -----
genActiveContextTrampoline
"Short-circuit the interpreter call if a frame is already married."
| jumpSingle |
<var: #jumpSingle type: #'AbstractInstruction *'>
opcodeIndex := 0.
self MoveMw: FoxMethod r: FPReg R: TempReg.
self AndCq: MFMethodFlagHasContextFlag R: TempReg.
jumpSingle := self JumpZero: 0.
self MoveMw: FoxThisContext r: FPReg R: ReceiverResultReg.
self RetN: 0.
jumpSingle jmpTarget: self Label.
+ ^self genTrampolineFor: #ceActiveContext
- ^self genTrampolineFor: #ceActiveContext asSymbol
called: 'ceActiveContextTrampoline'
callJumpBar: true
numArgs: 0
arg: nil
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: ReceiverResultReg
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>genCheckForInterruptsTrampoline (in category 'initialization') -----
genCheckForInterruptsTrampoline
opcodeIndex := 0.
self PopR: TempReg. "instruction pointer"
self MoveR: TempReg Aw: coInterpreter instructionPointerAddress.
+ ^self genTrampolineFor: #ceCheckForInterrupts
- ^self genTrampolineFor: #ceCheckForInterrupts asSymbol
called: 'ceCheckForInterruptsTrampoline'
callJumpBar: true
numArgs: 0
arg: nil
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>genInnerPICAbortTrampoline: (in category 'initialization') -----
genInnerPICAbortTrampoline: name
"Generate the abort for a PIC. This abort performs either a call of
ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged
target or a call of ceMNUFromPICMNUMethod:receiver: to handle an
MNU dispatch in a closed PIC. It distinguishes the two by testing
ClassReg. If the register is zero then this is an MNU."
<var: #name type: #'char *'>
| jumpMNUCase |
<var: #jumpMNUCase type: #'AbstractInstruction *'>
self CmpCq: 0 R: ClassReg.
jumpMNUCase := self JumpZero: 0.
+ self compileTrampolineFor: #ceInterpretMethodFromPIC:receiver:
- self compileTrampolineFor: #ceInterpretMethodFromPIC:receiver: asSymbol
callJumpBar: true
numArgs: 2
arg: SendNumArgsReg
arg: ReceiverResultReg
arg: nil
arg: nil
saveRegs: false
resultReg: nil.
jumpMNUCase jmpTarget: self Label.
+ ^self genTrampolineFor: #ceMNUFromPICMNUMethod:receiver:
- ^self genTrampolineFor: #ceMNUFromPICMNUMethod:receiver: asSymbol
called: name
callJumpBar: true
numArgs: 2
arg: SendNumArgsReg
arg: ReceiverResultReg
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>genMethodAbortTrampoline (in category 'initialization') -----
genMethodAbortTrampoline
"Generate the abort for a method. This abort performs either a call of ceSICMiss:
to handle a single-in-line cache miss or a call of ceStackOverflow: to handle a
stack overflow. It distinguishes the two by testing ResultReceiverReg. If the
register is zero then this is a stack-overflow because a) the receiver has already
been pushed and so can be set to zero before calling the abort, and b) the
receiver must always contain an object (and hence be non-zero) on SIC miss."
| jumpSICMiss |
<var: #jumpSICMiss type: #'AbstractInstruction *'>
opcodeIndex := 0.
self CmpCq: 0 R: ReceiverResultReg.
jumpSICMiss := self JumpNonZero: 0.
+ self compileTrampolineFor: #ceStackOverflow:
- self compileTrampolineFor: #ceStackOverflow: asSymbol
callJumpBar: true
numArgs: 1
arg: SendNumArgsReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil.
jumpSICMiss jmpTarget: self Label.
+ ^self genTrampolineFor: #ceSICMiss:
- ^self genTrampolineFor: #ceSICMiss: asSymbol
called: 'ceMethodAbort'
callJumpBar: true
numArgs: 1
arg: ReceiverResultReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>genNonLocalReturnTrampoline (in category 'initialization') -----
genNonLocalReturnTrampoline
opcodeIndex := 0.
self PopR: TempReg. "instruction pointer"
self MoveR: TempReg Aw: coInterpreter instructionPointerAddress.
+ ^self genTrampolineFor: #ceNonLocalReturn:
- ^self genTrampolineFor: #ceNonLocalReturn: asSymbol
called: 'ceNonLocalReturnTrampoline'
callJumpBar: true
numArgs: 1
arg: ReceiverResultReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>generateEnilopmarts (in category 'initialization') -----
generateEnilopmarts
"Enilopmarts transfer control from C into machine code (backwards trampolines)."
self cppIf: Debug
ifTrue:
[realCEEnterCogCodePopReceiverReg :=
self genEnilopmartFor: ReceiverResultReg
called: 'realCEEnterCogCodePopReceiverReg'.
+ ceEnterCogCodePopReceiverReg := #enterCogCodePopReceiver.
- ceEnterCogCodePopReceiverReg := #enterCogCodePopReceiver asSymbol.
realCEEnterCogCodePopReceiverAndClassRegs :=
self genEnilopmartFor: ReceiverResultReg
and: ClassReg
called: 'realCEEnterCogCodePopReceiverAndClassRegs'.
+ ceEnterCogCodePopReceiverAndClassRegs := #enterCogCodePopReceiverAndClassRegs]
- ceEnterCogCodePopReceiverAndClassRegs := #enterCogCodePopReceiverAndClassRegs asSymbol]
ifFalse:
[ceEnterCogCodePopReceiverReg := self genEnilopmartFor: ReceiverResultReg
called: 'ceEnterCogCodePopReceiverReg'.
ceEnterCogCodePopReceiverAndClassRegs :=
self genEnilopmartFor: ReceiverResultReg
and: ClassReg
called: 'ceEnterCogCodePopReceiverAndClassRegs'].
self genPrimReturnEnterCogCodeEnilopmart: false.
cePrimReturnEnterCogCode := methodZoneBase.
self outputInstructionsForGeneratedRuntimeAt: cePrimReturnEnterCogCode.
self recordGeneratedRunTime: 'cePrimReturnEnterCogCode' address: cePrimReturnEnterCogCode.
self genPrimReturnEnterCogCodeEnilopmart: true.
cePrimReturnEnterCogCodeProfiling := methodZoneBase.
self outputInstructionsForGeneratedRuntimeAt: cePrimReturnEnterCogCodeProfiling.
self recordGeneratedRunTime: 'cePrimReturnEnterCogCodeProfiling' address: cePrimReturnEnterCogCodeProfiling!
Item was changed:
----- Method: Cogit>>generateNewspeakRuntime (in category 'initialization') -----
generateNewspeakRuntime
<option: #NewspeakVM>
| jumpMiss jumpItsTheReceiverStupid |
<var: #jumpMiss type: #'AbstractInstruction *'>
<var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'>
"Generate the non-send runtime support for Newspeak, explicit outer and implicit receiver.
The dynamic frequency of explicit outer is so low we merely call an interpreter routine."
+ ceExplicitReceiverTrampoline := self genTrampolineFor: #ceExplicitReceiverAt:
- ceExplicitReceiverTrampoline := self genTrampolineFor: #ceExplicitReceiverAt: asSymbol
called: 'ceExplicitReceiverTrampoline'
arg: SendNumArgsReg
result: ReceiverResultReg.
"Cached push implicit receiver implementation. Caller looks like
mov selector, ClassReg
call ceImplicitReceiver
br continue
Lclass: .word
Lmixin:: .word
continue:
If class matches class of receiver then mixin contains either 0 or the implicit receiver.
If 0, answer the actual receiver, otherwise the mixin.
Generate the class fetch and cache probe inline for speed. Smashes Arg0Reg and caller-saved regs."
opcodeIndex := 0.
self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg.
objectRepresentation genGetClassObjectOf: ReceiverResultReg into: ClassReg scratchReg: TempReg.
self MoveMw: 0 r: SPReg R: TempReg.
self MoveMw: backEnd jumpShortByteSize r: TempReg R: Arg0Reg.
self CmpR: ClassReg R: Arg0Reg.
jumpMiss := self JumpNonZero: 0.
self MoveMw: backEnd jumpShortByteSize + BytesPerOop r: TempReg R: ClassReg.
self CmpCq: 0 R: ClassReg.
jumpItsTheReceiverStupid := self JumpZero: 0.
self MoveR: ClassReg R: ReceiverResultReg.
jumpItsTheReceiverStupid jmpTarget: (self RetN: 0).
jumpMiss jmpTarget: self Label.
ceImplicitReceiverTrampoline := self
+ genTrampolineFor: #ceImplicitReceiverFor:receiver:class:
- genTrampolineFor: #ceImplicitReceiverFor:receiver:class: asSymbol
called: 'ceImplicitReceiverTrampoline'
callJumpBar: true
numArgs: 3
arg: SendNumArgsReg
arg: ReceiverResultReg
arg: ClassReg
arg: nil
saveRegs: false
resultReg: ReceiverResultReg
appendOpcodes: true!
Item was changed:
----- Method: Cogit>>generateRunTimeTrampolines (in category 'initialization') -----
generateRunTimeTrampolines
"Generate the run-time entries at the base of the native code zone and update the base."
ceSendMustBeBooleanAddFalseTrampoline := self genMustBeBooleanTrampolineFor: objectMemory falseObject
called: 'ceSendMustBeBooleanAddFalseTrampoline'.
ceSendMustBeBooleanAddTrueTrampoline := self genMustBeBooleanTrampolineFor: objectMemory trueObject
called: 'ceSendMustBeBooleanAddTrueTrampoline'.
+ ceClosureCopyTrampoline := self genTrampolineFor: #ceClosureCopyDescriptor:
- "Slang needs these apparently superfluous asSymbol sends."
- ceClosureCopyTrampoline := self genTrampolineFor: #ceClosureCopyDescriptor: asSymbol
called: 'ceClosureCopyTrampoline'
arg: SendNumArgsReg
result: ReceiverResultReg.
ceActiveContextTrampoline := self genActiveContextTrampoline.
ceNonLocalReturnTrampoline := self genNonLocalReturnTrampoline.
+ ceBaseFrameReturnTrampoline := self genTrampolineFor: #ceBaseFrameReturn:
- ceBaseFrameReturnTrampoline := self genTrampolineFor: #ceBaseFrameReturn: asSymbol
called: 'ceBaseFrameReturnTrampoline'
arg: ReceiverResultReg.
+ ceCreateNewArrayTrampoline := self genTrampolineFor: #ceNewArraySlotSize:
- ceCreateNewArrayTrampoline := self genTrampolineFor: #ceNewArraySlotSize: asSymbol
called: 'ceCreateNewArrayTrampoline'
arg: SendNumArgsReg
result: ReceiverResultReg.
ceCheckForInterruptTrampoline := self genCheckForInterruptsTrampoline.
ceStoreCheckTrampoline := objectRepresentation genStoreCheckTrampoline.
+ ceFetchContextInstVarTrampoline := self genTrampolineFor: #ceContext:instVar:
- ceFetchContextInstVarTrampoline := self genTrampolineFor: #ceContext:instVar: asSymbol
called: 'ceFetchContextInstVarTrampoline'
arg: ReceiverResultReg
arg: SendNumArgsReg
result: SendNumArgsReg.
+ ceStoreContextInstVarTrampoline := self genTrampolineFor: #ceContext:instVar:value:
- ceStoreContextInstVarTrampoline := self genTrampolineFor: #ceContext:instVar:value: asSymbol
called: 'ceStoreContextInstVarTrampoline'
arg: ReceiverResultReg
arg: SendNumArgsReg
arg: ClassReg
result: ReceiverResultReg. "to keep ReceiverResultReg live."
+ cePositive32BitIntegerTrampoline := self genTrampolineFor: #cePositive32BitIntegerFor:
- cePositive32BitIntegerTrampoline := self genTrampolineFor: #cePositive32BitIntegerFor: asSymbol
called: 'cePositive32BitIntegerTrampoline'
arg: ReceiverResultReg
result: TempReg.
+ ceReturnToInterpreterTrampoline := self genTrampolineFor: #ceReturnToInterpreter:
- ceReturnToInterpreterTrampoline := self genTrampolineFor: #ceReturnToInterpreter: asSymbol
called: 'ceReturnToInterpreterTrampoline'
arg: ReceiverResultReg.
+ ceCannotResumeTrampoline := self genTrampolineFor: #ceCannotResume
- ceCannotResumeTrampoline := self genTrampolineFor: #ceCannotResume asSymbol
called: 'ceCannotResumeTrampoline'!
Item was changed:
----- Method: Cogit>>generateSendTrampolines (in category 'initialization') -----
generateSendTrampolines
- "Slang needs these apparently superfluous asSymbol sends."
0 to: NumSendTrampolines - 2 do:
[:numArgs|
sendTrampolines
at: numArgs
+ put: (self genTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genTrampolineFor: #ceSend:super:to:numArgs: asSymbol
called: (self trampolineName: 'ceSend' numArgs: numArgs)
arg: ClassReg
arg: 0
arg: ReceiverResultReg
arg: numArgs)].
sendTrampolines
at: NumSendTrampolines - 1
+ put: (self genTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genTrampolineFor: #ceSend:super:to:numArgs: asSymbol
called: (self trampolineName: 'ceSend' numArgs: -1)
arg: ClassReg
arg: 0
arg: ReceiverResultReg
arg: SendNumArgsReg).
self cppIf: NewspeakVM
ifTrue:
[0 to: NumSendTrampolines - 2 do:
[:numArgs|
dynamicSuperSendTrampolines
at: numArgs
+ put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs:
- put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs: asSymbol
called: (self trampolineName: 'ceDynSuperSend' numArgs: numArgs)
arg: ClassReg
arg: ReceiverResultReg
arg: numArgs)].
dynamicSuperSendTrampolines
at: NumSendTrampolines - 1
+ put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs:
- put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs: asSymbol
called: (self trampolineName: 'ceDynSuperSend' numArgs: -1)
arg: ClassReg
arg: ReceiverResultReg
arg: SendNumArgsReg)].
0 to: NumSendTrampolines - 2 do:
[:numArgs|
superSendTrampolines
at: numArgs
+ put: (self genTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genTrampolineFor: #ceSend:super:to:numArgs: asSymbol
called: (self trampolineName: 'ceSuperSend' numArgs: numArgs)
arg: ClassReg
arg: 1
arg: ReceiverResultReg
arg: numArgs)].
superSendTrampolines
at: NumSendTrampolines - 1
+ put: (self genTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genTrampolineFor: #ceSend:super:to:numArgs: asSymbol
called: (self trampolineName: 'ceSuperSend' numArgs: -1)
arg: ClassReg
arg: 1
arg: ReceiverResultReg
arg: SendNumArgsReg).
firstSend := sendTrampolines at: 0.
lastSend := superSendTrampolines at: NumSendTrampolines - 1!
Item was changed:
----- Method: Cogit>>generateStackPointerCapture (in category 'initialization') -----
generateStackPointerCapture
"Generate a routine ceCaptureCStackPointers that will capture the C stack pointer,
and, if it is in use, the C frame pointer. These are used in trampolines to call
run-time routines in the interpreter from machine-code."
| oldMethodZoneBase oldTrampolineTableIndex |
self assertCStackWellAligned.
oldMethodZoneBase := methodZoneBase.
oldTrampolineTableIndex := trampolineTableIndex.
self generateCaptureCStackPointers: true.
+ self perform: #ceCaptureCStackPointers.
- self perform: #ceCaptureCStackPointers asSymbol.
(cFramePointerInUse := self isCFramePointerInUse) ifFalse:
[methodZoneBase := oldMethodZoneBase.
trampolineTableIndex := oldTrampolineTableIndex.
self generateCaptureCStackPointers: false]!
Item was changed:
----- Method: Cogit>>mapObjectReferencesInMachineCodeForBecome (in category 'garbage collection') -----
mapObjectReferencesInMachineCodeForBecome
"Update all references to objects in machine code for a become.
Unlike incrementalGC or fullGC a method that does not refer to young may
refer to young as a result of the become operation. Unlike incrementalGC
or fullGC the reference from a Cog method to its methodObject *must not*
change since the two are two halves of the same object."
| cogMethod hasYoungObj hasYoungObjPtr freedPIC |
<var: #cogMethod type: #'CogMethod *'>
hasYoungObj := false.
hasYoungObjPtr := self cCode: [(self addressOf: hasYoungObj) asInteger]
inSmalltalk: [CPluggableAccessor new
setObject: nil;
atBlock: [:obj :idx| hasYoungObj]
atPutBlock: [:obj :idx :val| hasYoungObj := val]].
codeModified := freedPIC := false.
self mapObjectReferencesInGeneratedRuntime.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[self assert: hasYoungObj not.
cogMethod cmType ~= CMFree ifTrue:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod selector: (objectRepresentation remapOop: cogMethod selector)..
cogMethod cmType = CMClosedPIC
ifTrue:
[((objectMemory isYoung: cogMethod selector)
or: [self mapObjectReferencesInClosedPIC: cogMethod]) ifTrue:
[freedPIC := true.
methodZone freeMethod: cogMethod]]
ifFalse:
[(objectMemory isYoung: cogMethod selector) ifTrue:
[hasYoungObj := true].
cogMethod cmType = CMMethod ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
self assert: ((coInterpreter rawHeaderOf: cogMethod methodObject) = cogMethod asInteger
or: [(self noAssertMethodClassAssociationOf: cogMethod methodObject)
= objectMemory nilObject]).
(objectMemory isYoung: cogMethod methodObject) ifTrue:
[hasYoungObj := true]].
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#remapNSIfObjectRef:pc:hasYoung:]
+ ifFalse: [#remapIfObjectRef:pc:hasYoung:])
- ifTrue: [#remapNSIfObjectRef:pc:hasYoung: asSymbol]
- ifFalse: [#remapIfObjectRef:pc:hasYoung: asSymbol])
arg: hasYoungObjPtr.
hasYoungObj
ifTrue:
[cogMethod cmRefersToYoung ifFalse:
[cogMethod cmRefersToYoung: true.
methodZone addToYoungReferrers: cogMethod].
hasYoungObj := false]
ifFalse: [cogMethod cmRefersToYoung: false]]].
cogMethod := methodZone methodAfter: cogMethod].
methodZone pruneYoungReferrers.
freedPIC ifTrue:
[self unlinkSendsToFree.
codeModified := true].
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
[processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>mapObjectReferencesInMachineCodeForFullGC (in category 'garbage collection') -----
mapObjectReferencesInMachineCodeForFullGC
"Update all references to objects in machine code for a full gc. Since
the current (New)ObjectMemory GC makes everything old in a full GC
a method not referring to young will not refer to young afterwards"
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
codeModified := false.
self mapObjectReferencesInGeneratedRuntime.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType ~= CMFree ifTrue:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod selector: (objectRepresentation remapOop: cogMethod selector).
cogMethod cmType = CMClosedPIC
ifTrue:
[self assert: cogMethod cmRefersToYoung not.
self mapObjectReferencesInClosedPIC: cogMethod]
ifFalse:
[cogMethod cmType = CMMethod ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject)].
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#remapNSIfObjectRef:pc:hasYoung:]
+ ifFalse: [#remapIfObjectRef:pc:hasYoung:])
- ifTrue: [#remapNSIfObjectRef:pc:hasYoung: asSymbol]
- ifFalse: [#remapIfObjectRef:pc:hasYoung: asSymbol])
arg: 0.
(cogMethod cmRefersToYoung
and: [objectRepresentation allYoungObjectsAgeInFullGC]) ifTrue:
[cogMethod cmRefersToYoung: false]]].
cogMethod := methodZone methodAfter: cogMethod].
methodZone pruneYoungReferrers.
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
[processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>mapObjectReferencesInMachineCodeForIncrementalGC (in category 'garbage collection') -----
mapObjectReferencesInMachineCodeForIncrementalGC
"Update all references to objects in machine code for an incremental gc.
Avoid scanning all code by using the youngReferrers list. In an incremental
GC a method referring to young may no longer refer to young, but a method
not referring to young cannot and will not refer to young afterwards."
| pointer cogMethod hasYoungObj hasYoungObjPtr |
<var: #cogMethod type: #'CogMethod *'>
hasYoungObj := false.
hasYoungObjPtr := self cCode: [(self addressOf: hasYoungObj) asInteger]
inSmalltalk: [CPluggableAccessor new
setObject: nil;
atBlock: [:obj :idx| hasYoungObj]
atPutBlock: [:obj :idx :val| hasYoungObj := val]].
codeModified := false.
pointer := methodZone youngReferrers.
[pointer < methodZone zoneEnd] whileTrue:
[self assert: hasYoungObj not.
cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'.
cogMethod cmType = CMFree
ifTrue: [self assert: cogMethod cmRefersToYoung not]
ifFalse:
[self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0.
cogMethod cmRefersToYoung ifTrue:
[self assert: (cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]).
cogMethod selector: (objectRepresentation remapOop: cogMethod selector).
(objectMemory isYoung: cogMethod selector) ifTrue:
[hasYoungObj := true].
cogMethod cmType = CMMethod ifTrue:
[self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod.
cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject).
(objectMemory isYoung: cogMethod methodObject) ifTrue:
[hasYoungObj := true]].
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#remapNSIfObjectRef:pc:hasYoung:]
+ ifFalse: [#remapIfObjectRef:pc:hasYoung:])
- ifTrue: [#remapNSIfObjectRef:pc:hasYoung: asSymbol]
- ifFalse: [#remapIfObjectRef:pc:hasYoung: asSymbol])
arg: hasYoungObjPtr.
hasYoungObj
ifTrue: [hasYoungObj := false]
ifFalse: [cogMethod cmRefersToYoung: false]]].
pointer := pointer + BytesPerWord].
methodZone pruneYoungReferrers.
codeModified ifTrue: "After updating oops in inline caches we need to flush the icache."
[processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>markLiteralsAndUnlinkUnmarkedSendsIn: (in category 'garbage collection') -----
markLiteralsAndUnlinkUnmarkedSendsIn: cogMethod
"Unlink sends that have unmarked classes in inline caches or freed/freeable targets.
Nil-out inline caches linked to open PICs.
Assert that any selectors are marked. We can do this since
this is only run on marked methods and thus any selectors they
reference should already be marked."
<var: #cogMethod type: #'CogMethod *'>
<inline: true>
self assert: cogMethod cmType = CMMethod.
self assert: (objectMemory isMarked: cogMethod methodObject).
objectRepresentation markAndTraceLiteral: cogMethod selector.
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method:]
+ ifFalse: [#markLiteralsAndUnlinkIfUnmarkedSend:pc:method:])
- ifTrue: [#markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method: asSymbol]
- ifFalse: [#markLiteralsAndUnlinkIfUnmarkedSend:pc:method: asSymbol])
arg: cogMethod asInteger!
Item was changed:
----- Method: Cogit>>markMethodAndReferents: (in category 'jit - api') -----
markMethodAndReferents: aCogMethod
<api>
<var: #aCogMethod type: #'CogBlockMethod *'>
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
self assert: (aCogMethod cmType = CMMethod
or: [aCogMethod cmType = CMBlock]).
cogMethod := aCogMethod cmType = CMMethod
ifTrue: [self cCoerceSimple: aCogMethod to: #'CogMethod *']
ifFalse: [aCogMethod cmHomeMethod].
cogMethod cmUsageCount: CMMaxUsageCount.
self mapFor: cogMethod
+ performUntil: #incrementUsageOfTargetIfLinkedSend:mcpc:ignored:
- performUntil: #incrementUsageOfTargetIfLinkedSend:mcpc:ignored: asSymbol
arg: 0!
Item was changed:
----- Method: Cogit>>markYoungObjectsIn: (in category 'garbage collection') -----
markYoungObjectsIn: cogMethod
"Mark young literals in the method."
<var: #cogMethod type: #'CogMethod *'>
<inline: true>
self assert: (cogMethod cmType = CMMethod
or: [cogMethod cmType = CMOpenPIC]).
(objectMemory isYoung: cogMethod selector) ifTrue:
[objectMemory markAndTrace: cogMethod selector].
(cogMethod cmType = CMMethod
and: [objectMemory isYoung: cogMethod methodObject]) ifTrue:
[objectMemory markAndTrace: cogMethod methodObject].
self mapFor: cogMethod
performUntil: (self cppIf: NewspeakVM
+ ifTrue: [#markNSYoungObjects:pc:method:]
+ ifFalse: [#markYoungObjects:pc:method:])
- ifTrue: [#markNSYoungObjects:pc:method: asSymbol]
- ifFalse: [#markYoungObjects:pc:method: asSymbol])
arg: cogMethod asInteger!
Item was changed:
----- Method: Cogit>>mcPCFor:startBcpc:in: (in category 'method map') -----
mcPCFor: bcpc startBcpc: startbcpc in: cogMethod
"Answer the absolute machine code pc matching the zero-relative bytecode pc argument
in cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogBlockMethod *'>
| absPC |
absPC := self
mapFor: cogMethod
bcpc: startbcpc
+ performUntil: #findMcpc:Bcpc:MatchingBcpc:
- performUntil: #findMcpc:Bcpc:MatchingBcpc: asSymbol
arg: (self cCoerceSimple: bcpc to: #'void *').
^absPC ~= 0
ifTrue: [absPC asUnsignedInteger - cogMethod asUnsignedInteger]
ifFalse: [absPC]!
Item was changed:
----- Method: Cogit>>relocateCallsAndSelfReferencesInMethod: (in category 'compaction') -----
relocateCallsAndSelfReferencesInMethod: cogMethod
<var: #cogMethod type: #'CogMethod *'>
| delta |
delta := cogMethod objectHeader signedIntFromLong.
backEnd relocateCallBeforeReturnPC: cogMethod asInteger + missOffset by: delta negated.
self mapFor: cogMethod
+ performUntil: #relocateIfCallOrMethodReference:mcpc:delta:
- performUntil: #relocateIfCallOrMethodReference:mcpc:delta: asSymbol
arg: delta!
Item was changed:
----- Method: Cogit>>scanBlock: (in category 'compile abstract instructions') -----
scanBlock: blockStart
"Scan the block to determine if the block needs a frame or not"
| descriptor pc end stackDelta nExts |
<var: #blockStart type: #'BlockStart *'>
<var: #descriptor type: #'BytecodeDescriptor *'>
needsFrame := false.
methodOrBlockNumArgs := blockStart numArgs.
nExts := 0.
pc := blockStart startpc.
end := blockStart startpc + blockStart span.
stackDelta := 0.
[pc < end] whileTrue:
[byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset.
descriptor := self generatorAt: byte0.
needsFrame ifFalse:
[(descriptor needsFrameFunction isNil
or: [self perform: descriptor needsFrameFunction with: true])
ifTrue: [needsFrame := true]
ifFalse: [stackDelta := stackDelta + descriptor stackDelta]].
pc := self nextBytecodePCFor: descriptor at: pc exts: nExts in: methodObj.
nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]].
needsFrame ifFalse:
[stackDelta < 0 ifTrue:
[self error: 'negative stack delta in block; block contains bogus code or internal error'].
[stackDelta > 0] whileTrue:
[descriptor := self generatorAt: (objectMemory fetchByte: blockStart startpc ofObject: methodObj) + bytecodeSetOffset.
+ descriptor generator ~~ #genPushConstantNilBytecode ifTrue:
- descriptor generator ~~ #genPushConstantNilBytecode asSymbol ifTrue:
[self error: 'frameless block doesn''t start with enough pushNils'].
blockStart
startpc: blockStart startpc + descriptor numBytes;
span: blockStart span - descriptor numBytes.
stackDelta := stackDelta - 1]]!
Item was changed:
----- Method: Cogit>>unlinkAllSends (in category 'jit - api') -----
unlinkAllSends
<api>
"Unlink all sends in cog methods."
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase isNil ifTrue: [^self].
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
+ performUntil: #unlinkIfLinkedSend:pc:ignored:
- performUntil: #unlinkIfLinkedSend:pc:ignored: asSymbol
arg: 0]
ifFalse:
[cogMethod cmType ~= CMFree ifTrue:
[methodZone freeMethod: cogMethod]].
cogMethod := methodZone methodAfter: cogMethod].
"After updating inline caches we need to flush the icache."
processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger!
Item was changed:
----- Method: Cogit>>unlinkSendsOf:isMNUSelector: (in category 'jit - api') -----
unlinkSendsOf: selector isMNUSelector: isMNUSelector
<api>
"Unlink all sends in cog methods."
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase isNil ifTrue: [^self].
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
"First check if any method actually has the selector; if not there can't
be any linked send to it."
[cogMethod < methodZone limitZony
and: [cogMethod selector ~= selector]] whileTrue:
[cogMethod := methodZone methodAfter: cogMethod].
cogMethod >= methodZone limitZony ifTrue:
[^nil].
codeModified := false.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
+ performUntil: #unlinkIfLinkedSend:pc:of:
- performUntil: #unlinkIfLinkedSend:pc:of: asSymbol
arg: selector]
ifFalse:
[(cogMethod cmType ~= CMFree
and: [(isMNUSelector and: [cogMethod cpicHasMNUCase])
or: [cogMethod selector = selector]]) ifTrue:
[methodZone freeMethod: cogMethod]].
cogMethod := methodZone methodAfter: cogMethod].
codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
[processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: Cogit>>unlinkSendsTo:andFreeIf: (in category 'jit - api') -----
unlinkSendsTo: targetMethodObject andFreeIf: freeIfTrue
<api>
"Unlink all sends in cog methods to a particular target method.
If targetMethodObject isn't actually a method (perhaps being
used via invokeAsMethod) then flush all sends since anything
could be affected."
| cogMethod targetMethod freedPIC |
<var: #cogMethod type: #'CogMethod *'>
<var: #targetMethod type: #'CogMethod *'>
((objectMemory isOopCompiledMethod: targetMethodObject)
and: [coInterpreter methodHasCogMethod: targetMethodObject]) ifFalse:
[^self].
targetMethod := coInterpreter cogMethodOf: targetMethodObject.
methodZoneBase isNil ifTrue: [^self].
codeModified := freedPIC := false.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
+ performUntil: #unlinkIfLinkedSend:pc:to:
- performUntil: #unlinkIfLinkedSend:pc:to: asSymbol
arg: targetMethod asInteger]
ifFalse:
[(cogMethod cmType = CMClosedPIC
and: [self cPIC: cogMethod HasTarget: targetMethod]) ifTrue:
[methodZone freeMethod: cogMethod.
freedPIC := true]].
cogMethod := methodZone methodAfter: cogMethod].
freeIfTrue ifTrue: [self freeMethod: targetMethod].
freedPIC
ifTrue: [self unlinkSendsToFree]
ifFalse:
[codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
[processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]]!
Item was changed:
----- Method: Cogit>>unlinkSendsToFree (in category 'garbage collection') -----
unlinkSendsToFree
<api>
"Unlink all sends in cog methods to free methods and/or pics."
| cogMethod |
<var: #cogMethod type: #'CogMethod *'>
methodZoneBase isNil ifTrue: [^self].
codeModified := false.
cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'.
[cogMethod < methodZone limitZony] whileTrue:
[cogMethod cmType = CMMethod
ifTrue:
[self mapFor: cogMethod
+ performUntil: #unlinkIfLinkedSendToFree:pc:ignored:
- performUntil: #unlinkIfLinkedSendToFree:pc:ignored: asSymbol
arg: 0]
ifFalse:
[cogMethod cmType = CMClosedPIC ifTrue:
[self assert: (self noTargetsFreeInClosedPIC: cogMethod)]].
cogMethod := methodZone methodAfter: cogMethod].
codeModified ifTrue: "After possibly updating inline caches we need to flush the icache."
[processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!
Item was changed:
----- Method: FilePlugin>>fileRecordSize (in category 'file primitives') -----
fileRecordSize
"Return the size of a Smalltalk file record in bytes."
<static: false>
+ ^self sizeof: #SQFile!
- ^self sizeof: #SQFile asSymbol!
Item was changed:
----- Method: Interpreter>>addNewMethodToCache (in category 'method lookup cache') -----
addNewMethodToCache
"Add the given entry to the method cache.
The policy is as follows:
Look for an empty entry anywhere in the reprobe chain.
If found, install the new entry there.
If not found, then install the new entry at the first probe position
and delete the entries in the rest of the reprobe chain.
This has two useful purposes:
If there is active contention over the first slot, the second
or third will likely be free for reentry after ejection.
Also, flushing is good when reprobe chains are getting full."
| probe hash |
<inline: false>
hash := messageSelector bitXor: lkupClass. "drop low-order zeros from addresses"
(self isOopCompiledMethod: newMethod)
ifTrue:
[primitiveIndex := self primitiveIndexOf: newMethod.
primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: lkupClass]
ifFalse:
+ [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod].
- [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod asSymbol].
primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: lkupClass.
0 to: CacheProbeMax-1 do:
[:p | probe := (hash >> p) bitAnd: MethodCacheMask.
(methodCache at: probe + MethodCacheSelector) = 0 ifTrue:
["Found an empty entry -- use it"
methodCache at: probe + MethodCacheSelector put: messageSelector.
methodCache at: probe + MethodCacheClass put: lkupClass.
methodCache at: probe + MethodCacheMethod put: newMethod.
methodCache at: probe + MethodCachePrim put: primitiveIndex.
methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: 'long').
^ nil]].
"OK, we failed to find an entry -- install at the first slot..."
probe := hash bitAnd: MethodCacheMask. "first probe"
methodCache at: probe + MethodCacheSelector put: messageSelector.
methodCache at: probe + MethodCacheClass put: lkupClass.
methodCache at: probe + MethodCacheMethod put: newMethod.
methodCache at: probe + MethodCachePrim put: primitiveIndex.
methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: 'long').
"...and zap the following entries"
1 to: CacheProbeMax-1 do:
[:p | probe := (hash >> p) bitAnd: MethodCacheMask.
methodCache at: probe + MethodCacheSelector put: 0].
!
Item was changed:
----- Method: Interpreter>>positive64BitValueOf: (in category 'primitive support') -----
positive64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive SmallInteger or an eight-byte LargePositiveInteger."
| sz szsqLong value |
<returnTypeC: #sqLong>
<var: #value type: #sqLong>
(self isIntegerObject: oop) ifTrue:
[value := self integerValueOf: oop.
value < 0 ifTrue: [^self primitiveFail].
^ value].
(self
isClassOfNonImm: oop
equalTo: (self splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex) ifFalse:
[^self primitiveFail].
+ szsqLong := self sizeof: #sqLong.
- szsqLong := self sizeof: #sqLong asSymbol.
sz := self lengthOf: oop.
sz > szsqLong ifTrue:
[^self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (self fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
^value!
Item was changed:
----- Method: Interpreter>>signed64BitValueOf: (in category 'primitive support') -----
signed64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive ST integer or a eight-byte LargeInteger."
| sz value largeClass negative szsqLong |
<inline: false>
<returnTypeC: #sqLong>
<var: #value type: #sqLong>
(self isIntegerObject: oop) ifTrue: [^self cCoerce: (self integerValueOf: oop) to: #sqLong].
largeClass := self fetchClassOfNonInt: oop.
largeClass = self classLargePositiveInteger
ifTrue:[negative := false]
ifFalse:[largeClass = self classLargeNegativeInteger
ifTrue:[negative := true]
ifFalse:[^self primitiveFail]].
+ szsqLong := self sizeof: #sqLong.
- szsqLong := self sizeof: #sqLong asSymbol.
sz := self lengthOf: oop.
sz > szsqLong
ifTrue: [^ self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (self fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
"Filter out values out of range for the signed interpretation such as
16rFFFFFFFF... (positive w/ bit 64 set) and -16rFFFFFFFF... (negative w/ bit
64 set). Since the sign is implicit in the class we require that the high bit of
the magnitude is not set which is a simple test here. Note that we have to
handle the most negative 64-bit value -9223372036854775808 specially."
self cCode: []
inSmalltalk:
[(value anyMask: 16r8000000000000000) ifTrue:
[value := value - 16r10000000000000000]].
value < 0 ifTrue:
[self cCode:
[self assert: (self sizeof: value) == 8.
self assert: (self sizeof: value << 1) == 8].
"Don't fail for -9223372036854775808/-16r8000000000000000.
Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer
overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined."
(negative and: [0 = (self cCode: [value << 1]
inSmalltalk: [value << 1 bitAnd: (1 << 64) - 1])]) ifTrue:
[^value].
^self primitiveFail].
^negative
ifTrue:[0 - value]
ifFalse:[value]!
Item was changed:
----- Method: InterpreterPrimitives>>magnitude64BitValueOf: (in category 'primitive support') -----
magnitude64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive SmallInteger or a eight-byte LargeInteger."
| sz value ok smallIntValue |
<returnTypeC: #usqLong>
<var: #value type: #usqLong>
(objectMemory isIntegerObject: oop) ifTrue:
[smallIntValue := (objectMemory integerValueOf: oop).
smallIntValue < 0 ifTrue: [smallIntValue := 0 - smallIntValue].
^self cCoerce: smallIntValue to: #usqLong].
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
ok
ifFalse:
[ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargeNegativeInteger)
compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
ok ifFalse: [^self primitiveFail]].
sz := objectMemory lengthOf: oop.
+ sz > (self sizeof: #sqLong) ifTrue:
- sz > (self sizeof: #sqLong asSymbol) ifTrue:
[^self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
^value!
Item was changed:
----- Method: InterpreterPrimitives>>positive64BitValueOf: (in category 'primitive support') -----
positive64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive SmallInteger or an eight-byte LargePositiveInteger."
<returnTypeC: #sqLong>
| sz value ok |
<var: #value type: #sqLong>
(objectMemory isIntegerObject: oop) ifTrue:
[value := objectMemory integerValueOf: oop.
value < 0 ifTrue: [^self primitiveFail].
^value].
ok := objectMemory
isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
+ (ok and: [(sz := objectMemory lengthOf: oop) <= (self sizeof: #sqLong)]) ifFalse:
- (ok and: [(sz := objectMemory lengthOf: oop) <= (self sizeof: #sqLong asSymbol)]) ifFalse:
[^self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
^value!
Item was changed:
----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in category 'primitive support') -----
positiveMachineIntegerValueOf: oop
"Answer a value of an integer in address range, i.e up to the size of a machine word.
The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size."
<returnTypeC: #'unsigned long'>
| value bs ok |
(objectMemory isIntegerObject: oop) ifTrue:
[value := objectMemory integerValueOf: oop.
value < 0 ifTrue: [^self primitiveFail].
^value].
ok := objectMemory
isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
+ (ok and: [(bs := objectMemory lengthOf: oop) <= (self sizeof: #'unsigned long')]) ifFalse:
- (ok and: [(bs := objectMemory lengthOf: oop) <= (self sizeof: #'unsigned long' asSymbol)]) ifFalse:
[^self primitiveFail].
+ ((self sizeof: #'unsigned long') = 8
- ((self sizeof: #'unsigned long' asSymbol) = 8
and: [bs > 4]) ifTrue:
[^ (objectMemory fetchByte: 0 ofObject: oop)
+ ((objectMemory fetchByte: 1 ofObject: oop) << 8)
+ ((objectMemory fetchByte: 2 ofObject: oop) << 16)
+ ((objectMemory fetchByte: 3 ofObject: oop) << 24)
+ ((objectMemory fetchByte: 4 ofObject: oop) << 32)
+ ((objectMemory fetchByte: 5 ofObject: oop) << 40)
+ ((objectMemory fetchByte: 6 ofObject: oop) << 48)
+ ((objectMemory fetchByte: 7 ofObject: oop) << 56)].
^ (objectMemory fetchByte: 0 ofObject: oop)
+ ((objectMemory fetchByte: 1 ofObject: oop) << 8)
+ ((objectMemory fetchByte: 2 ofObject: oop) << 16)
+ ((objectMemory fetchByte: 3 ofObject: oop) << 24)!
Item was changed:
----- Method: InterpreterPrimitives>>signed64BitValueOf: (in category 'primitive support') -----
signed64BitValueOf: oop
"Convert the given object into an integer value.
The object may be either a positive SmallInteger or a eight-byte LargeInteger."
| sz value negative ok |
<inline: false>
<returnTypeC: #sqLong>
<var: #value type: #sqLong>
(objectMemory isIntegerObject: oop) ifTrue:
[^self cCoerce: (objectMemory integerValueOf: oop) to: #sqLong].
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
ok
ifTrue: [negative := false]
ifFalse:
[negative := true.
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargeNegativeInteger)
compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
ok ifFalse: [^self primitiveFail]].
sz := objectMemory lengthOf: oop.
+ sz > (self sizeof: #sqLong) ifTrue:
- sz > (self sizeof: #sqLong asSymbol) ifTrue:
[^self primitiveFail].
value := 0.
0 to: sz - 1 do: [:i |
value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
"Filter out values out of range for the signed interpretation such as
16rFFFFFFFF... (positive w/ bit 64 set) and -16rFFFFFFFF... (negative w/ bit
64 set). Since the sign is implicit in the class we require that the high bit of
the magnitude is not set which is a simple test here. Note that we have to
handle the most negative 64-bit value -9223372036854775808 specially."
self cCode: []
inSmalltalk:
[(value anyMask: 16r8000000000000000) ifTrue:
[value := value - 16r10000000000000000]].
value < 0 ifTrue:
[self cCode:
[self assert: (self sizeof: value) == 8.
self assert: (self sizeof: value << 1) == 8].
"Don't fail for -9223372036854775808/-16r8000000000000000.
Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer
overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined."
(negative and: [0 = (self cCode: [value << 1]
inSmalltalk: [value << 1 bitAnd: (1 << 64) - 1])]) ifTrue:
[^value].
^self primitiveFail].
^negative
ifTrue:[0 - value]
ifFalse:[value]!
Item was changed:
----- Method: InterpreterPrimitives>>signedMachineIntegerValueOf: (in category 'primitive support') -----
signedMachineIntegerValueOf: oop
"Answer a signed value of an integer up to the size of a machine word.
The object may be either a positive SmallInteger or a LargeInteger of size <= word size."
<returnTypeC: #'long'>
| negative ok bs value bits |
<var: #value type: #long>
(objectMemory isIntegerObject: oop) ifTrue:
[^objectMemory integerValueOf: oop].
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
ok
ifTrue: [negative := false]
ifFalse:
[negative := true.
ok := objectMemory isClassOfNonImm: oop
equalTo: (objectMemory splObj: ClassLargeNegativeInteger)
compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
ok ifFalse: [^self primitiveFail]].
+ (bs := objectMemory lengthOf: oop) > (self sizeof: #'unsigned long') ifTrue:
- (bs := objectMemory lengthOf: oop) > (self sizeof: #'unsigned long' asSymbol) ifTrue:
[^self primitiveFail].
+ ((self sizeof: #'unsigned long') = 8
- ((self sizeof: #'unsigned long' asSymbol) = 8
and: [bs > 4])
ifTrue:
[value := (objectMemory fetchByte: 0 ofObject: oop)
+ ((objectMemory fetchByte: 1 ofObject: oop) << 8)
+ ((objectMemory fetchByte: 2 ofObject: oop) << 16)
+ ((objectMemory fetchByte: 3 ofObject: oop) << 24)
+ ((objectMemory fetchByte: 4 ofObject: oop) << 32)
+ ((objectMemory fetchByte: 5 ofObject: oop) << 40)
+ ((objectMemory fetchByte: 6 ofObject: oop) << 48)
+ ((objectMemory fetchByte: 7 ofObject: oop) << 56)]
ifFalse:
[value := (objectMemory fetchByte: 0 ofObject: oop)
+ ((objectMemory fetchByte: 1 ofObject: oop) << 8)
+ ((objectMemory fetchByte: 2 ofObject: oop) << 16)
+ ((objectMemory fetchByte: 3 ofObject: oop) << 24)].
self cCode: []
inSmalltalk:
[bits := (self sizeof: #long) * 8.
(value bitShift: 1 - bits) > 0 ifTrue:
[value := value - (1 bitShift: bits)]].
value < 0 ifTrue:
["Don't fail for -16r80000000[00000000].
Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer
overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined."
(negative and: [0 = (self cCode: [value << 1]
inSmalltalk: [value << 1 bitAnd: (1 << bits) - 1])]) ifTrue:
[^value].
^self primitiveFail].
^negative
ifTrue: [0 - value]
ifFalse: [value]!
Item was changed:
----- Method: InterpreterSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') -----
ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength
"Load and return the requested function from a module"
| pluginString functionString |
pluginString := String new: moduleLength.
1 to: moduleLength do:[:i| pluginString byteAt: i put: (self byteAt: moduleName+i-1)].
functionString := String new: functionLength.
1 to: functionLength do:[:i| functionString byteAt: i put: (self byteAt: functionName+i-1)].
- functionString := functionString asSymbol.
^self ioLoadFunction: functionString From: pluginString!
Item was changed:
----- Method: NewspeakInterpreter>>positiveMachineIntegerValueOf: (in category 'primitive support') -----
positiveMachineIntegerValueOf: oop
"Answer a value of an integer in address range, i.e up to the size of a machine word.
The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size."
<returnTypeC: #'unsigned long'>
| value bs ok |
(self isIntegerObject: oop) ifTrue:
[value := self integerValueOf: oop.
value < 0 ifTrue: [^self primitiveFail].
^value].
ok := self
isClassOfNonImm: oop
equalTo: (self splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
+ (ok and: [(bs := self lengthOf: oop) <= (self sizeof: #'unsigned long')]) ifFalse:
- (ok and: [(bs := self lengthOf: oop) <= (self sizeof: #'unsigned long' asSymbol)]) ifFalse:
[^self primitiveFail].
+ ((self sizeof: #'unsigned long') = 8
- ((self sizeof: #'unsigned long' asSymbol) = 8
and: [bs > 4]) ifTrue:
[^ (self fetchByte: 0 ofObject: oop)
+ ((self fetchByte: 1 ofObject: oop) << 8)
+ ((self fetchByte: 2 ofObject: oop) << 16)
+ ((self fetchByte: 3 ofObject: oop) << 24)
+ ((self fetchByte: 4 ofObject: oop) << 32)
+ ((self fetchByte: 5 ofObject: oop) << 40)
+ ((self fetchByte: 6 ofObject: oop) << 48)
+ ((self fetchByte: 7 ofObject: oop) << 56)].
^ (self fetchByte: 0 ofObject: oop)
+ ((self fetchByte: 1 ofObject: oop) << 8)
+ ((self fetchByte: 2 ofObject: oop) << 16)
+ ((self fetchByte: 3 ofObject: oop) << 24)!
Item was changed:
----- Method: NewspeakInterpreter>>signedMachineIntegerValueOf: (in category 'primitive support') -----
signedMachineIntegerValueOf: oop
"Answer a signed value of an integer up to the size of a machine word.
The object may be either a positive SmallInteger or a LargeInteger of size <= word size."
<returnTypeC: #'long'>
| negative ok bs value bits |
<var: #value type: #long>
(self isIntegerObject: oop) ifTrue:
[^self integerValueOf: oop].
ok := self isClassOfNonImm: oop
equalTo: (self splObj: ClassLargePositiveInteger)
compactClassIndex: ClassLargePositiveIntegerCompactIndex.
ok
ifTrue: [negative := false]
ifFalse:
[negative := true.
ok := self isClassOfNonImm: oop
equalTo: (self splObj: ClassLargeNegativeInteger)
compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
ok ifFalse: [^self primitiveFail]].
+ (bs := self lengthOf: oop) > (self sizeof: #'unsigned long') ifTrue:
- (bs := self lengthOf: oop) > (self sizeof: #'unsigned long' asSymbol) ifTrue:
[^self primitiveFail].
+ ((self sizeof: #'unsigned long') = 8
- ((self sizeof: #'unsigned long' asSymbol) = 8
and: [bs > 4])
ifTrue:
[value := (self fetchByte: 0 ofObject: oop)
+ ((self fetchByte: 1 ofObject: oop) << 8)
+ ((self fetchByte: 2 ofObject: oop) << 16)
+ ((self fetchByte: 3 ofObject: oop) << 24)
+ ((self fetchByte: 4 ofObject: oop) << 32)
+ ((self fetchByte: 5 ofObject: oop) << 40)
+ ((self fetchByte: 6 ofObject: oop) << 48)
+ ((self fetchByte: 7 ofObject: oop) << 56)]
ifFalse:
[value := (self fetchByte: 0 ofObject: oop)
+ ((self fetchByte: 1 ofObject: oop) << 8)
+ ((self fetchByte: 2 ofObject: oop) << 16)
+ ((self fetchByte: 3 ofObject: oop) << 24)].
self cCode: []
inSmalltalk:
[bits := (self sizeof: #long) * 8.
(value bitShift: 1 - bits) > 0 ifTrue:
[value := value - (1 bitShift: bits)]].
value < 0 ifTrue:
["Don't fail for -16r80000000[00000000].
Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer
overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined."
(negative and: [0 = (self cCode: [value << 1]
inSmalltalk: [value << 1 bitAnd: (1 << bits) - 1])]) ifTrue:
[^value].
^self primitiveFail].
^negative
ifTrue: [0 - value]
ifFalse: [value]!
Item was changed:
----- Method: NewspeakInterpreterSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') -----
ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength
"Load and return the requested function from a module"
| pluginString functionString |
pluginString := String new: moduleLength.
1 to: moduleLength do:[:i| pluginString byteAt: i put: (self byteAt: moduleName+i-1)].
functionString := String new: functionLength.
1 to: functionLength do:[:i| functionString byteAt: i put: (self byteAt: functionName+i-1)].
- functionString := functionString asSymbol.
^self ioLoadFunction: functionString From: pluginString!
Item was changed:
----- Method: SimpleStackBasedCogit>>compileInterpreterPrimitive: (in category 'primitive generators') -----
compileInterpreterPrimitive: primitiveRoutine
"Compile a call to an interpreter primitive. Call the C routine with the
usual stack-switching dance, test the primFailCode and then either
return on success or continue to the method body."
<var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'>
| flags jmp jmpSamplePrim continuePostSamplePrim jmpSampleNonPrim continuePostSampleNonPrim |
<var: #jmp type: #'AbstractInstruction *'>
<var: #jmpSamplePrim type: #'AbstractInstruction *'>
<var: #continuePostSamplePrim type: #'AbstractInstruction *'>
<var: #jmpSampleNonPrim type: #'AbstractInstruction *'>
<var: #continuePostSampleNonPrim type: #'AbstractInstruction *'>
"Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers"
self genExternalizePointersForPrimitiveCall.
"Switch to the C stack."
self genLoadCStackPointersForPrimCall.
flags := coInterpreter primitivePropertyFlags: primitiveIndex.
(flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue:
["Test nextProfileTick for being non-zero and call checkProfileTick if so"
BytesPerWord = 4
ifTrue:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg.
self OrR: TempReg R: ClassReg]
ifFalse:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self CmpCq: 0 R: TempReg].
"If set, jump to record sample call."
jmpSampleNonPrim := self JumpNonZero: 0.
continuePostSampleNonPrim := self Label].
"Clear the primFailCode and set argumentCount"
self MoveCq: 0 R: TempReg.
self MoveR: TempReg Aw: coInterpreter primFailCodeAddress.
methodOrBlockNumArgs ~= 0 ifTrue:
[self MoveCq: methodOrBlockNumArgs R: TempReg].
self MoveR: TempReg Aw: coInterpreter argumentCountAddress.
(flags bitAnd: PrimCallNeedsPrimitiveFunction) ~= 0 ifTrue:
[self MoveCw: primitiveRoutine asInteger R: TempReg.
self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress].
"Old full prim trace is in VMMaker-eem.550 and prior"
self recordPrimTrace ifTrue:
[self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg].
((flags bitAnd: PrimCallNeedsNewMethod+PrimCallMayCallBack) ~= 0) ifTrue:
["The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness."
(flags bitAnd: PrimCallMayCallBack) ~= 0 ifTrue:
[needsFrame := true].
methodLabel addDependent:
(self annotateAbsolutePCRef:
(self MoveCw: methodLabel asInteger R: ClassReg)).
+ self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg.
- self MoveMw: (self offset: CogMethod of: #methodObject asSymbol) r: ClassReg R: TempReg.
self MoveR: TempReg Aw: coInterpreter newMethodAddress].
self PrefetchAw: coInterpreter primFailCodeAddress.
(flags bitAnd: PrimCallMayCallBack) ~= 0
ifTrue: "Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode."
[backEnd genSubstituteReturnAddress:
((flags bitAnd: PrimCallCollectsProfileSamples) ~= 0
ifTrue: [cePrimReturnEnterCogCodeProfiling]
ifFalse: [cePrimReturnEnterCogCode]).
self JumpRT: primitiveRoutine asInteger.
primInvokeLabel := self Label.
jmp := jmpSamplePrim := continuePostSamplePrim := nil]
ifFalse:
["Call the C primitive routine."
self CallRT: primitiveRoutine asInteger.
primInvokeLabel := self Label.
(flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue:
[self assert: (flags bitAnd: PrimCallNeedsNewMethod) ~= 0.
"Test nextProfileTick for being non-zero and call checkProfileTick if so"
BytesPerWord = 4
ifTrue:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self MoveAw: coInterpreter nextProfileTickAddress + BytesPerWord R: ClassReg.
self OrR: TempReg R: ClassReg]
ifFalse:
[self MoveAw: coInterpreter nextProfileTickAddress R: TempReg.
self CmpCq: 0 R: TempReg].
"If set, jump to record sample call."
jmpSamplePrim := self JumpNonZero: 0.
continuePostSamplePrim := self Label].
"Switch back to the Smalltalk stack. Stack better be in either of these two states:
success: stackPointer -> result (was receiver)
arg1
...
argN
return pc
failure: receiver
arg1
...
stackPointer -> argN
return pc
In either case we can push the instructionPointer to reestablish the return pc"
self MoveAw: coInterpreter instructionPointerAddress R: ClassReg.
self genLoadStackPointers.
"Test primitive failure"
self MoveAw: coInterpreter primFailCodeAddress R: TempReg.
self PushR: ClassReg. "Restore return pc"
self flag: 'ask concrete code gen if move sets condition codes?'.
self CmpCq: 0 R: TempReg.
jmp := self JumpNonZero: 0.
"Fetch result from stack"
self MoveMw: BytesPerWord r: SPReg R: ReceiverResultReg.
self flag: 'currently caller pushes result'.
self RetN: BytesPerWord].
(flags bitAnd: PrimCallCollectsProfileSamples) ~= 0 ifTrue:
["The sample is collected by cePrimReturnEnterCogCode for external calls"
jmpSamplePrim notNil ifTrue:
["Call ceCheckProfileTick: to record sample and then continue."
jmpSamplePrim jmpTarget: self Label.
self assert: (flags bitAnd: PrimCallNeedsNewMethod) ~= 0.
self CallRT: (self cCode: '(unsigned long)ceCheckProfileTick'
inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]).
"reenter the post-primitive call flow"
self Jump: continuePostSamplePrim].
"Null newMethod and call ceCheckProfileTick: to record sample and then continue.
ceCheckProfileTick will map null/0 to coInterpreter nilObject"
jmpSampleNonPrim jmpTarget: self Label.
self MoveCq: 0 R: TempReg.
self MoveR: TempReg Aw: coInterpreter newMethodAddress.
self CallRT: (self cCode: '(unsigned long)ceCheckProfileTick'
inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]).
"reenter the post-primitive call flow"
self Jump: continuePostSampleNonPrim].
jmp notNil ifTrue:
["Jump to restore of receiver reg and proceed to frame build for failure."
jmp jmpTarget: self Label.
"Restore receiver reg from stack."
self MoveMw: BytesPerWord * (methodOrBlockNumArgs + 1) r: SPReg R: ReceiverResultReg].
^0!
Item was changed:
----- Method: SimpleStackBasedCogit>>genFastPrimTraceUsing:and: (in category 'primitive generators') -----
genFastPrimTraceUsing: r1 and: r2
"Suport for compileInterpreterPrimitive. Generate inline code so as to record the primitive
trace as fast as possible."
self MoveCq: 0 R: TempReg.
self MoveCq: 0 R: r2.
self MoveMb: coInterpreter primTraceLogIndexAddress r: TempReg R: r2.
self MoveR: r2 R: r1.
self AddCq: 1 R: r1.
self MoveR: r1 Mb: coInterpreter primTraceLogIndexAddress r: TempReg.
methodLabel addDependent:
(self annotateAbsolutePCRef:
(self MoveCw: methodLabel asInteger R: r1)).
+ self MoveMw: (self offset: CogMethod of: #selector) r: r1 R: TempReg.
- self MoveMw: (self offset: CogMethod of: #selector asSymbol) r: r1 R: TempReg.
self MoveCw: coInterpreter primTraceLogAddress asInteger R: r1.
self MoveR: TempReg Xwr: r2 R: r1!
Item was changed:
----- Method: SimpleStackBasedCogit>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') -----
genMustBeBooleanTrampolineFor: boolean called: trampolineName
<var: #trampolineName type: #'char *'>
<inline: false>
opcodeIndex := 0.
"If the objectRepresentation does want true & false to be mobile then we need to record these addresses."
self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not.
self AddCq: boolean R: TempReg.
+ ^self genTrampolineFor: #ceSendMustBeBoolean:
- ^self genTrampolineFor: #ceSendMustBeBoolean: asSymbol
called: trampolineName
callJumpBar: true
numArgs: 1
arg: TempReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveClosureValue (in category 'primitive generators') -----
genPrimitiveClosureValue
"Check the argument count. Fail if wrong.
Get the method from the outerContext and see if it is cogged. If so, jump to the
block entry or the no-context-switch entry, as appropriate, and we're done. If not,
invoke the interpreter primitive."
| jumpFail jumpBCMethod primitiveRoutine result |
<var: #jumpFail type: #'AbstractInstruction *'>
<var: #jumpBCMethod type: #'AbstractInstruction *'>
<var: #primitiveRoutine declareC: 'void (*primitiveRoutine)()'>
objectRepresentation genLoadSlot: ClosureNumArgsIndex sourceReg: ReceiverResultReg destReg: TempReg.
self CmpCq: (objectMemory integerObjectOf: methodOrBlockNumArgs) R: TempReg.
jumpFail := self JumpNonZero: 0.
objectRepresentation
genLoadSlot: ClosureOuterContextIndex sourceReg: ReceiverResultReg destReg: ClassReg;
genLoadSlot: MethodIndex sourceReg: ClassReg destReg: SendNumArgsReg;
genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg.
self MoveR: TempReg R: ClassReg.
jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg.
+ self MoveM16: (self offset: CogMethod of: #blockEntryOffset) r: ClassReg R: TempReg.
- self MoveM16: (self offset: CogMethod of: #blockEntryOffset asSymbol) r: ClassReg R: TempReg.
self AddR: ClassReg R: TempReg.
primitiveRoutine := coInterpreter
functionPointerForCompiledMethod: methodObj
primitiveIndex: primitiveIndex.
+ primitiveRoutine = #primitiveClosureValueNoContextSwitch ifTrue:
- primitiveRoutine = #primitiveClosureValueNoContextSwitch asSymbol ifTrue:
[blockNoContextSwitchOffset = nil ifTrue:
[^NotFullyInitialized].
self SubCq: blockNoContextSwitchOffset R: TempReg].
self JumpR: TempReg.
jumpBCMethod jmpTarget: self Label.
(result := self compileInterpreterPrimitive: primitiveRoutine) < 0 ifTrue:
[^result].
jumpFail jmpTarget: self Label.
^0!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatDivide (in category 'primitive generators') -----
genPrimitiveFloatDivide
+ ^self genDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:!
- ^self genDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg: asSymbol!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatEqual (in category 'primitive generators') -----
genPrimitiveFloatEqual
+ ^self genDoubleComparison: #JumpFPEqual: invert: false!
- ^self genDoubleComparison: #JumpFPEqual: asSymbol invert: false!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatGreaterOrEqual (in category 'primitive generators') -----
genPrimitiveFloatGreaterOrEqual
+ ^self genDoubleComparison: #JumpFPGreaterOrEqual: invert: false!
- ^self genDoubleComparison: #JumpFPGreaterOrEqual: asSymbol invert: false!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatGreaterThan (in category 'primitive generators') -----
genPrimitiveFloatGreaterThan
+ ^self genDoubleComparison: #JumpFPGreater: invert: false!
- ^self genDoubleComparison: #JumpFPGreater: asSymbol invert: false!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatLessOrEqual (in category 'primitive generators') -----
genPrimitiveFloatLessOrEqual
+ ^self genDoubleComparison: #JumpFPGreaterOrEqual: invert: true!
- ^self genDoubleComparison: #JumpFPGreaterOrEqual: asSymbol invert: true!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatLessThan (in category 'primitive generators') -----
genPrimitiveFloatLessThan
+ ^self genDoubleComparison: #JumpFPGreater: invert: true!
- ^self genDoubleComparison: #JumpFPGreater: asSymbol invert: true!
Item was changed:
----- Method: SimpleStackBasedCogit>>genPrimitiveFloatNotEqual (in category 'primitive generators') -----
genPrimitiveFloatNotEqual
+ ^self genDoubleComparison: #JumpFPNotEqual: invert: false!
- ^self genDoubleComparison: #JumpFPNotEqual: asSymbol invert: false!
Item was changed:
----- Method: SimpleStackBasedCogit>>genTraceStoreTrampoline (in category 'initialization') -----
genTraceStoreTrampoline
+ ceTraceStoreTrampoline := self genSafeTrampolineFor: #ceTraceStoreOf:into:
- ceTraceStoreTrampoline := self genSafeTrampolineFor: #ceTraceStoreOf:into: asSymbol
called: 'ceTraceStoreTrampoline'
arg: ClassReg
arg: ReceiverResultReg!
Item was changed:
----- Method: SimpleStackBasedCogit>>generateMissAbortTrampolines (in category 'initialization') -----
generateMissAbortTrampolines
"Generate the run-time entries for the various method and PIC entry misses and aborts..
Read the class-side method trampolines for documentation on the various trampolines"
- "Slang needs these apparently superfluous asSymbol sends."
ceMethodAbortTrampoline := self genMethodAbortTrampoline.
cePICAbortTrampoline := self genPICAbortTrampoline.
+ ceCPICMissTrampoline := self genTrampolineFor: #ceCPICMiss:receiver:
- ceCPICMissTrampoline := self genTrampolineFor: #ceCPICMiss:receiver: asSymbol
called: 'ceCPICMissTrampoline'
arg: ClassReg
arg: ReceiverResultReg.
self cCode: '' inSmalltalk:
[simulatedTrampolines
at: (self simulatedAddressFor: #ceSendFromInLineCacheMiss:)
put: #ceSendFromInLineCacheMiss:]!
Item was changed:
----- Method: SimpleStackBasedCogit>>generateTracingTrampolines (in category 'initialization') -----
generateTracingTrampolines
"Generate trampolines for tracing. In the simulator we can save a lot of time
and avoid noise instructions in the lastNInstructions log by short-cutting these
trampolines, but we need them in the real vm."
ceTraceLinkedSendTrampoline
:= self cCode:
+ [self genSafeTrampolineFor: #ceTraceLinkedSend:
- [self genSafeTrampolineFor: #ceTraceLinkedSend: asSymbol
called: 'ceTraceLinkedSendTrampoline'
arg: ReceiverResultReg]
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceLinkedSend:)
put: #ceShortCutTraceLinkedSend:.
a].
ceTraceBlockActivationTrampoline
:= self cCode:
+ [self genTrampolineFor: #ceTraceBlockActivation
- [self genTrampolineFor: #ceTraceBlockActivation asSymbol
called: 'ceTraceBlockActivationTrampoline']
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceBlockActivation:)
put: #ceShortCutTraceBlockActivation:.
a].
ceTraceStoreTrampoline
:= self cCode:
+ [self genSafeTrampolineFor: #ceTraceStoreOf:into:
- [self genSafeTrampolineFor: #ceTraceStoreOf:into: asSymbol
called: 'ceTraceStoreTrampoline'
arg: ClassReg
arg: ReceiverResultReg]
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceStore:)
put: #ceShortCutTraceStore:.
a]!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>bytecodePCFor:startBcpc:in: (in category 'method map') -----
bytecodePCFor: mcpc startBcpc: startbcpc in: cogMethod
"Answer the zero-relative bytecode pc matching the machine code pc argument in
cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogBlockMethod *'>
^self
mapFor: cogMethod
bcpc: startbcpc
+ performUntil: #find:Mcpc:Bcpc:MatchingMcpc:
- performUntil: #find:Mcpc:Bcpc:MatchingMcpc: asSymbol
arg: (self cCoerceSimple: mcpc to: #'void *')!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') -----
genMustBeBooleanTrampolineFor: boolean called: trampolineName
"This can be entered in one of two states, depending on SendNumArgsReg. See
e.g. genJumpIf:to:. If SendNumArgsReg is non-zero then this has been entered via
the initial test of the counter in the jump executed count (i.e. the counter has
tripped). In this case TempReg contains the boolean to be tested and should not
be offset, and ceCounterTripped should be invoked with the unoffset TempReg.
If SendNumArgsReg is zero then this has been entered for must-be-boolean
processing. TempReg has been offset by boolean and must be corrected and
ceSendMustBeBoolean: invoked with the corrected value."
<var: #trampolineName type: #'char *'>
| jumpMBB |
<var: #jumpMBB type: #'AbstractInstruction *'>
<inline: false>
opcodeIndex := 0.
self CmpCq: 0 R: SendNumArgsReg.
jumpMBB := self JumpZero: 0.
+ self compileTrampolineFor: #ceCounterTripped:
- self compileTrampolineFor: #ceCounterTripped: asSymbol
callJumpBar: true
numArgs: 1
arg: TempReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil.
"If the objectRepresentation does want true & false to be mobile then we need to record these addresses."
self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not.
jumpMBB jmpTarget: (self AddCq: boolean R: TempReg).
+ ^self genTrampolineFor: #ceSendMustBeBoolean:
- ^self genTrampolineFor: #ceSendMustBeBoolean: asSymbol
called: trampolineName
callJumpBar: true
numArgs: 1
arg: TempReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>mcPCFor:startBcpc:in: (in category 'method map') -----
mcPCFor: bcpc startBcpc: startbcpc in: cogMethod
"Answer the absolute machine code pc matching the zero-relative bytecode pc argument
in cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogBlockMethod *'>
| absPC |
absPC := self
mapFor: cogMethod
bcpc: startbcpc
+ performUntil: #find:Mcpc:Bcpc:MatchingBcpc:
- performUntil: #find:Mcpc:Bcpc:MatchingBcpc: asSymbol
arg: (self cCoerceSimple: bcpc to: #'void *').
^absPC ~= 0
ifTrue: [absPC asUnsignedInteger - cogMethod asUnsignedInteger]
ifFalse: [absPC]!
Item was changed:
----- Method: SistaStackToRegisterMappingCogit>>picDataFor:into: (in category 'method introspection') -----
picDataFor: cogMethod into: arrayObj
"Answer the zero-relative bytecode pc matching the machine code pc argument in
cogMethod, given the start of the bytecodes for cogMethod's block or method object."
<api>
<var: #cogMethod type: #'CogMethod *'>
| errCode |
cogMethod stackCheckOffset = 0 ifTrue:
[^0].
picDataIndex := 0.
picData := arrayObj.
errCode := self
mapFor: (self cCoerceSimple: cogMethod to: #'CogBlockMethod *')
bcpc: (coInterpreter startPCOfMethod: cogMethod methodObject)
+ performUntil: #picDataFor:Mcpc:Bcpc:Method:
- performUntil: #picDataFor:Mcpc:Bcpc:Method: asSymbol
arg: (self cCoerceSimple: cogMethod to: #'void *').
errCode ~= 0 ifTrue:
[self assert: errCode = PrimErrNoMemory.
^-1].
^picDataIndex!
Item was changed:
----- Method: StackInterpreter>>addNewMethodToCache: (in category 'method lookup cache') -----
addNewMethodToCache: class
"Add the given entry to the method cache.
The policy is as follows:
Look for an empty entry anywhere in the reprobe chain.
If found, install the new entry there.
If not found, then install the new entry at the first probe position
and delete the entries in the rest of the reprobe chain.
This has two useful purposes:
If there is active contention over the first slot, the second
or third will likely be free for reentry after ejection.
Also, flushing is good when reprobe chains are getting full."
| probe hash primitiveIndex |
<inline: false>
hash := messageSelector bitXor: class. "drop low-order zeros from addresses"
(objectMemory isOopCompiledMethod: newMethod)
ifTrue:
[primitiveIndex := self primitiveIndexOf: newMethod.
primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: class]
ifFalse:
+ [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod].
- [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod asSymbol].
0 to: CacheProbeMax-1 do:
[:p | probe := (hash >> p) bitAnd: MethodCacheMask.
(methodCache at: probe + MethodCacheSelector) = 0 ifTrue:
["Found an empty entry -- use it"
methodCache at: probe + MethodCacheSelector put: messageSelector.
methodCache at: probe + MethodCacheClass put: class.
methodCache at: probe + MethodCacheMethod put: newMethod.
methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: #long).
lastMethodCacheProbeWrite := probe. "this for primitiveExternalMethod"
^ nil]].
"OK, we failed to find an entry -- install at the first slot..."
probe := hash bitAnd: MethodCacheMask. "first probe"
methodCache at: probe + MethodCacheSelector put: messageSelector.
methodCache at: probe + MethodCacheClass put: class.
methodCache at: probe + MethodCacheMethod put: newMethod.
methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: #long).
lastMethodCacheProbeWrite := probe. "this for primitiveExternalMethod"
"...and zap the following entries"
1 to: CacheProbeMax-1 do:
[:p | probe := (hash >> p) bitAnd: MethodCacheMask.
methodCache at: probe + MethodCacheSelector put: 0]!
Item was changed:
----- Method: StackInterpreterSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') -----
ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength
"Load and return the requested function from a module"
| pluginString functionString |
pluginString := String new: moduleLength.
1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)].
functionString := String new: functionLength.
1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)].
- functionString := functionString asSymbol.
^self ioLoadFunction: functionString From: pluginString!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genMethodAbortTrampolineFor: (in category 'initialization') -----
genMethodAbortTrampolineFor: numArgs
"Generate the abort for a method. This abort performs either a call of ceSICMiss:
to handle a single-in-line cache miss or a call of ceStackOverflow: to handle a
stack overflow. It distinguishes the two by testing ResultReceiverReg. If the
register is zero then this is a stack-overflow because a) the receiver has already
been pushed and so can be set to zero before calling the abort, and b) the
receiver must always contain an object (and hence be non-zero) on SIC miss."
| jumpSICMiss |
<var: #jumpSICMiss type: #'AbstractInstruction *'>
opcodeIndex := 0.
self CmpCq: 0 R: ReceiverResultReg.
jumpSICMiss := self JumpNonZero: 0.
+ self compileTrampolineFor: #ceStackOverflow:
- self compileTrampolineFor: #ceStackOverflow: asSymbol
callJumpBar: true
numArgs: 1
arg: SendNumArgsReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil.
jumpSICMiss jmpTarget: self Label.
self genPushRegisterArgsForAbortMissNumArgs: numArgs.
+ ^self genTrampolineFor: #ceSICMiss:
- ^self genTrampolineFor: #ceSICMiss: asSymbol
called: (self trampolineName: 'ceMethodAbort' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1]))
callJumpBar: true
numArgs: 1
arg: ReceiverResultReg
arg: nil
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true!
Item was changed:
----- Method: StackToRegisterMappingCogit>>genPICMissTrampolineFor: (in category 'initialization') -----
genPICMissTrampolineFor: numArgs
| startAddress |
<var: #aString type: #'char *'>
<inline: false>
startAddress := methodZoneBase.
opcodeIndex := 0.
"N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack."
self genPushRegisterArgsForNumArgs: numArgs.
+ self genTrampolineFor: #ceCPICMiss:receiver:
- self genTrampolineFor: #ceCPICMiss:receiver: asSymbol
called: (self trampolineName: 'cePICMiss' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1]))
callJumpBar: true
numArgs: 2
arg: ClassReg
arg: ReceiverResultReg
arg: nil
arg: nil
saveRegs: false
resultReg: nil
appendOpcodes: true.
^startAddress!
Item was changed:
----- Method: StackToRegisterMappingCogit>>generateEnilopmarts (in category 'initialization') -----
generateEnilopmarts
"Enilopmarts transfer control from C into machine code (backwards trampolines).
Override to add version for generic and PIC-specific entry with reg args."
super generateEnilopmarts.
self cppIf: Debug
ifTrue:
[realCEEnterCogCodePopReceiverArg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
called: 'realCEEnterCogCodePopReceiverArg0Regs'.
+ ceEnterCogCodePopReceiverArg0Regs := #enterCogCodePopReceiverArg0Regs.
- ceEnterCogCodePopReceiverArg0Regs := #enterCogCodePopReceiverArg0Regs asSymbol.
realCEEnterCogCodePopReceiverArg1Arg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
and: Arg1Reg
called: 'realCEEnterCogCodePopReceiverArg1Arg0Regs'.
+ ceEnterCogCodePopReceiverArg1Arg0Regs := #enterCogCodePopReceiverArg1Arg0Regs]
- ceEnterCogCodePopReceiverArg1Arg0Regs := #enterCogCodePopReceiverArg1Arg0Regs asSymbol]
ifFalse:
[ceEnterCogCodePopReceiverArg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
called: 'ceEnterCogCodePopReceiverArg0Regs'.
ceEnterCogCodePopReceiverArg1Arg0Regs :=
self genEnilopmartFor: ReceiverResultReg
and: Arg0Reg
and: Arg1Reg
called: 'ceEnterCogCodePopReceiverArg1Arg0Regs'].
"These are special versions of the ceEnterCogCodePopReceiverAndClassRegs enilopmart that also
pop register argsfrom the stack to undo the pushing of register args in the abort/miss trampolines."
ceEnter0ArgsPIC := self genEnterPICEnilopmartNumArgs: 0.
self numRegArgs >= 1 ifTrue:
[ceEnter1ArgsPIC := self genEnterPICEnilopmartNumArgs: 1.
self numRegArgs >= 2 ifTrue:
[ceEnter1ArgsPIC := self genEnterPICEnilopmartNumArgs: 2.
self assert: self numRegArgs = 2]]!
Item was changed:
----- Method: StackToRegisterMappingCogit>>generateSendTrampolines (in category 'initialization') -----
generateSendTrampolines
"Override to generate code to push the register arg(s) for <= numRegArg arity sends."
- "Slang needs these apparently superfluous asSymbol sends."
0 to: NumSendTrampolines - 2 do:
[:numArgs|
sendTrampolines
at: numArgs
+ put: (self genSendTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: asSymbol
numArgs: numArgs
called: (self trampolineName: 'ceSend' numArgs: numArgs)
arg: ClassReg
arg: 0
arg: ReceiverResultReg
arg: numArgs)].
sendTrampolines
at: NumSendTrampolines - 1
+ put: (self genSendTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: asSymbol
numArgs: self numRegArgs + 1
called: (self trampolineName: 'ceSend' numArgs: -1)
arg: ClassReg
arg: 0
arg: ReceiverResultReg
arg: SendNumArgsReg).
self cppIf: NewspeakVM
ifTrue:
[0 to: NumSendTrampolines - 2 do:
[:numArgs|
dynamicSuperSendTrampolines
at: numArgs
+ put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs:
- put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs: asSymbol
numArgs: numArgs
called: (self trampolineName: 'ceDynSuperSend' numArgs: numArgs)
arg: ClassReg
arg: ReceiverResultReg
arg: numArgs)].
dynamicSuperSendTrampolines
at: NumSendTrampolines - 1
+ put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs:
- put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs: asSymbol
numArgs: self numRegArgs + 1
called: (self trampolineName: 'ceDynSuperSend' numArgs: -1)
arg: ClassReg
arg: ReceiverResultReg
arg: SendNumArgsReg)].
0 to: NumSendTrampolines - 2 do:
[:numArgs|
superSendTrampolines
at: numArgs
+ put: (self genSendTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: asSymbol
numArgs: numArgs
called: (self trampolineName: 'ceSuperSend' numArgs: numArgs)
arg: ClassReg
arg: 1
arg: ReceiverResultReg
arg: numArgs)].
superSendTrampolines
at: NumSendTrampolines - 1
+ put: (self genSendTrampolineFor: #ceSend:super:to:numArgs:
- put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: asSymbol
numArgs: self numRegArgs + 1
called: (self trampolineName: 'ceSuperSend' numArgs: -1)
arg: ClassReg
arg: 1
arg: ReceiverResultReg
arg: SendNumArgsReg).
firstSend := sendTrampolines at: 0.
lastSend := superSendTrampolines at: NumSendTrampolines - 1!
Item was changed:
----- Method: StackToRegisterMappingCogit>>generateTracingTrampolines (in category 'initialization') -----
generateTracingTrampolines
"Generate trampolines for tracing. In the simulator we can save a lot of time
and avoid noise instructions in the lastNInstructions log by short-cutting these
trampolines, but we need them in the real vm."
ceTraceLinkedSendTrampoline
:= self cCode:
+ [self genSafeTrampolineFor: #ceTraceLinkedSend:
- [self genSafeTrampolineFor: #ceTraceLinkedSend: asSymbol
called: 'ceTraceLinkedSendTrampoline'
arg: ReceiverResultReg]
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceLinkedSend:)
put: #ceShortCutTraceLinkedSend:.
a].
ceTraceBlockActivationTrampoline
:= self cCode:
+ [self genTrampolineFor: #ceTraceBlockActivation
- [self genTrampolineFor: #ceTraceBlockActivation asSymbol
called: 'ceTraceBlockActivationTrampoline']
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceBlockActivation:)
put: #ceShortCutTraceBlockActivation:.
a].
ceTraceStoreTrampoline
:= self cCode:
+ [self genSafeTrampolineFor: #ceTraceStoreOf:into:
- [self genSafeTrampolineFor: #ceTraceStoreOf:into: asSymbol
called: 'ceTraceStoreTrampoline'
arg: TempReg
arg: ReceiverResultReg]
inSmalltalk:
[| a |
simulatedTrampolines
at: (a := self simulatedAddressFor: #ceShortCutTraceStore:)
put: #ceShortCutTraceStore:.
a]!
Item was changed:
----- Method: StackToRegisterMappingCogit>>v3:Is:Push:Nil: (in category 'span functions') -----
v3: descriptor Is: pc Push: nExts Nil: aMethodObj
<var: #descriptor type: #'BytecodeDescriptor *'>
<inline: true>
+ ^descriptor generator == #genPushConstantNilBytecode!
- ^descriptor generator == #genPushConstantNilBytecode asSymbol!
Item was changed:
----- Method: StackToRegisterMappingCogit>>v4:Is:Push:Nil: (in category 'span functions') -----
v4: descriptor Is: pc Push: nExts Nil: aMethodObj
<var: #descriptor type: #'BytecodeDescriptor *'>
<inline: true>
+ ^descriptor generator == #genExtPushPseudoVariableOrOuterBytecode
- ^descriptor generator == #genExtPushPseudoVariableOrOuterBytecode asSymbol
and: [self assert: (objectMemory fetchByte: pc ofObject: aMethodObj) = 77.
nExts = 1
and: [(objectMemory fetchByte: pc - 1 ofObject: aMethodObj) = 2]]!
Item was added:
+ ----- Method: Symbol>>defined (in category '*VMMaker-interpreter simulator') -----
+ defined
+ "To allow constructs such as self cppIf: #'SA_NOCLDSTOP' defined ifTrue: [...].
+ We could go look for a definition but likely there won't be one."
+ ^false!
Item was changed:
----- Method: TConstantNode>>printOn:level: (in category 'printing') -----
printOn: aStream level: level
+ value isSymbol
+ ifTrue: [aStream nextPutAll: (value copyWithout: $:)]
+ ifFalse: [value storeOn: aStream]!
-
- value storeOn: aStream.!
Item was added:
+ ----- Method: TLabeledCommentNode>>needsTrailingSemicolon (in category 'testing') -----
+ needsTrailingSemicolon
+ "Answer if, when emitted as a statement (in particular in a TStmtList), the
+ receiver needs a trailing semicolon. Comments do not. You'd think that
+ labels do not, but we put them at the end of blocks where there needs
+ to be a null statement following the label and before the end of block."
+ ^self isComment not!
Item was changed:
----- Method: TParseNode>>allCalls (in category 'utilities') -----
allCalls
"Answer a collection of selectors for the messages sent in this parse tree."
| calls |
+ calls := Set new: 32.
- calls := Set new: 100.
self nodesDo:
+ [:node|
- [ :node |
node isSend ifTrue:
+ [calls add: node selector].
+ (node isConstant and: [node value isSymbol]) ifTrue:
+ [calls add: node value]].
- [((calls add: node selector) = #asSymbol
- and: [node receiver isConstant
- and: [node receiver value isSymbol]]) ifTrue:
- [calls add: node receiver value]]].
^calls!
Item was removed:
- ----- Method: TParseNode>>isPreprocessorDirective (in category 'testing') -----
- isPreprocessorDirective
- ^false!
Item was added:
+ ----- Method: TParseNode>>needsTrailingSemicolon (in category 'testing') -----
+ needsTrailingSemicolon
+ "Answer if, when emitted as a statement (in particular in a TStmtList), the
+ receiver needs a trailing semicolon. Subclasses redefine as appropriate."
+ ^true!
Item was added:
+ ----- Method: TSendNode>>needsTrailingSemicolon (in category 'testing') -----
+ needsTrailingSemicolon
+ "Answer if, when emitted as a statement (in particular in a TStmtList), the
+ receiver needs a trailing semicolon. Preprocessor directives and special expansions do not."
+ ^(self isPreprocessorDirective
+ or: [self isValueExpansion
+ or: [selector == #expandDereferenceInterpreterProxyFunctionTable]]) not!
Item was changed:
----- Method: TStmtListNode>>emitCCodeOn:prependToEnd:level:generator: (in category 'C code generation') -----
emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level generator: aCodeGen
self emitCCommentOn: aStream level: level.
statements withIndexDo:
[:s :idx|
s emitCCommentOn: aStream level: level.
aStream peekLast ~~ Character tab ifTrue:
[aStream tab: level].
(aNodeOrNil notNil
and: [idx = statements size])
ifTrue:
[s emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level generator: aCodeGen]
ifFalse:
[s emitCCodeOn: aStream level: level generator: aCodeGen].
+ (self endsWithCloseBracket: aStream) ifFalse:
+ [s needsTrailingSemicolon ifTrue:
+ [aStream nextPut: $;]].
- ((self endsWithCloseBracket: aStream)
- or: [s isComment
- or: [s isPreprocessorDirective
- or: [s isSend and: [s isValueExpansion]]]]) ifFalse:
- [aStream nextPut: $;].
aStream cr].
!
Item was changed:
----- Method: ThreadedFFIPlugin>>ffiCall:ArgArrayOrNil:NumArgs: (in category 'callout support') -----
ffiCall: externalFunction ArgArrayOrNil: argArrayOrNil NumArgs: nArgs
"Generic callout. Does the actual work. If argArrayOrNil is nil it takes args from the stack
and the spec from the method. If argArrayOrNil is not nil takes args from argArrayOrNil
and the spec from the receiver."
| flags argTypeArray address argType oop argSpec argClass err theCalloutState calloutState requiredStackSize stackSize allocation result |
<inline: true>
<var: #theCalloutState type: #'CalloutState'>
<var: #calloutState type: #'CalloutState *'>
<var: #allocation type: #'char *'>
(interpreterProxy is: externalFunction KindOfClass: interpreterProxy classExternalFunction) ifFalse:
[^self ffiFail: FFIErrorNotFunction].
"Load and check the values in the externalFunction before we call out"
flags := interpreterProxy fetchInteger: ExternalFunctionFlagsIndex ofObject: externalFunction.
interpreterProxy failed ifTrue:
[^self ffiFail: FFIErrorBadArgs].
"This must come early for compatibility with the old FFIPlugin. Image-level code
may assume the function pointer is loaded eagerly. Thanks to Nicolas Cellier."
address := self ffiLoadCalloutAddress: externalFunction.
interpreterProxy failed ifTrue:
[^0 "error code already set by ffiLoadCalloutAddress:"].
argTypeArray := interpreterProxy fetchPointer: ExternalFunctionArgTypesIndex ofObject: externalFunction.
"must be array of arg types"
((interpreterProxy isArray: argTypeArray)
and: [(interpreterProxy slotSizeOf: argTypeArray) = (nArgs + 1)]) ifFalse:
[^self ffiFail: FFIErrorBadArgs].
"check if the calling convention is supported"
self cppIf: COGMTVM
ifTrue:
[(self ffiSupportsCallingConvention: (flags bitAnd: FFICallTypesMask)) ifFalse:
[^self ffiFail: FFIErrorCallType]]
ifFalse: "not masking causes threaded calls to fail, which is as they should if the plugin is not threaded."
[(self ffiSupportsCallingConvention: flags) ifFalse:
[^self ffiFail: FFIErrorCallType]].
requiredStackSize := self externalFunctionHasStackSizeSlot
ifTrue: [interpreterProxy
fetchInteger: ExternalFunctionStackSizeIndex
ofObject: externalFunction]
ifFalse: [-1].
interpreterProxy failed ifTrue:
[^interpreterProxy primitiveFailFor: (argArrayOrNil isNil
ifTrue: [PrimErrBadMethod]
ifFalse: [PrimErrBadReceiver])].
stackSize := requiredStackSize < 0 ifTrue: [DefaultMaxStackSize] ifFalse: [requiredStackSize].
self cCode: [] inSmalltalk: [theCalloutState := self class calloutStateClass new].
calloutState := self addressOf: theCalloutState.
+ self cCode: [self me: calloutState ms: 0 et: (self sizeof: #CalloutState)].
- self cCode: [self me: calloutState ms: 0 et: (self sizeof: #CalloutState asSymbol)].
calloutState callFlags: flags.
"Fetch return type and args"
argType := interpreterProxy fetchPointer: 0 ofObject: argTypeArray.
argSpec := interpreterProxy fetchPointer: 0 ofObject: argType.
argClass := interpreterProxy fetchPointer: 1 ofObject: argType.
(err := self ffiCheckReturn: argSpec With: argClass in: calloutState) ~= 0 ifTrue:
[^self ffiFail: err]. "cannot return"
"alloca the outgoing stack frame, leaving room for register args while marshalling, and including space for the return struct, if any."
allocation := self alloca: stackSize + calloutState structReturnSize + self registerArgsSlop + self cStackAlignment.
self allocaLiesSoUseGetsp ifTrue:
[allocation := self getsp].
self cStackAlignment ~= 0 ifTrue:
[allocation := self cCoerce: (allocation asUnsignedInteger bitClear: self cStackAlignment - 1)
to: #'char *'].
calloutState
argVector: allocation;
currentArg: allocation + self registerArgsSlop;
limit: allocation + stackSize + self registerArgsSlop.
(calloutState structReturnSize > 0
and: [self nonRegisterStructReturnIsViaImplicitFirstArgument
and: [(self returnStructInRegisters: calloutState structReturnSize) not]]) ifTrue:
[err := self ffiPushPointer: calloutState limit in: calloutState.
err ~= 0 ifTrue:
[self cleanupCalloutState: calloutState.
self cppIf: COGMTVM ifTrue:
[err = PrimErrObjectMayMove negated ifTrue:
[^PrimErrObjectMayMove]]. "N.B. Do not fail if object may move because caller will GC and retry."
^self ffiFail: err]].
1 to: nArgs do:
[:i|
argType := interpreterProxy fetchPointer: i ofObject: argTypeArray.
argSpec := interpreterProxy fetchPointer: 0 ofObject: argType.
argClass := interpreterProxy fetchPointer: 1 ofObject: argType.
oop := argArrayOrNil isNil
ifTrue: [interpreterProxy stackValue: nArgs - i]
ifFalse: [interpreterProxy fetchPointer: i - 1 ofObject: argArrayOrNil].
err := self ffiArgument: oop Spec: argSpec Class: argClass in: calloutState.
err ~= 0 ifTrue:
[self cleanupCalloutState: calloutState.
self cppIf: COGMTVM ifTrue:
[err = PrimErrObjectMayMove negated ifTrue:
[^PrimErrObjectMayMove]]. "N.B. Do not fail if object may move because caller will GC and retry."
^self ffiFail: err]]. "coercion failed or out of stack space"
"Failures must be reported back from ffiArgument:Spec:Class:in:.
Should not fail from here on in."
self assert: interpreterProxy failed not.
self ffiLogCallout: externalFunction.
(requiredStackSize < 0
and: [self externalFunctionHasStackSizeSlot]) ifTrue:
[stackSize := calloutState currentArg - calloutState argVector.
interpreterProxy storeInteger: ExternalFunctionStackSizeIndex ofObject: externalFunction withValue: stackSize].
"Go out and call this guy"
result := self ffiCalloutTo: address SpecOnStack: argArrayOrNil notNil in: calloutState.
self cleanupCalloutState: calloutState.
^result!
Item was removed:
- ----- Method: VMClass class>>browseSymbolRefsMissingAsSymbolSendLocalToPackage: (in category 'utilities') -----
- browseSymbolRefsMissingAsSymbolSendLocalToPackage: aPackageName
- "Slang will bite you hard if you write e.g.
- self sizeof: #mytype
- because it will translate this as
- sizeof(''mytype'').
- Instead you must write
- self sizeof: #mytype asSymbol
- because it will translate this as
- sizeof(mytype).
- This is a really easy slip to make (and arguably a horrible bug in Slang, but backward-compatibility etc, bitch, moan.
- So here's a scanner to find any offending occurrences. Forgive the deluge of false positives.
-
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #VMMaker.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #VMConstruction.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #'Qwaq-Plugins'.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #'Cog-ProcessorPlugins'.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #'SqueakSSL-Plugin'.
- VMClass browseSymbolRefsMissingAsSymbolSendLocalToPackage: #'Freetype-Plugin'"
-
- SystemNavigation new
- browseAllSelect:
- [:m| | is bad prevLit |
- m methodClass isMeta not
- and: [(m pragmaAt: #doNotGenerate) isNil
- and: [is := InstructionStream on: m.
- bad := false.
- [is atEnd] whileFalse:
- [[is interpretNextInstructionFor: nil]
- on: MessageNotUnderstood
- do: [:ex| | s args |
- s := ex message selector.
- args := ex message arguments.
- prevLit ifNotNil:
- [(s = #send:super:numArgs:
- and: [#(asSymbol cCoerceSimple:to: cCoerce:to: flag: primitive:parameters:receiver:)
- includes: args first]) ifFalse:
- [bad := true]].
- prevLit := (s == #pushConstant: and: [args first isSymbol]) ifTrue:
- [args first]]].
- bad]]]
- localToPackage: aPackageName!
1
0
14 Dec '12
Revision: 2634
Author: eliot
Date: 2012-12-13 16:58:29 -0800 (Thu, 13 Dec 2012)
Log Message:
-----------
Fix visibility of GetAttributeString on unix.
Modified Paths:
--------------
branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h
branches/Cog/platforms/unix/vm/sqUnixMain.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h 2012-12-14 00:32:58 UTC (rev 2633)
+++ branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h 2012-12-14 00:58:29 UTC (rev 2634)
@@ -1,4 +1,4 @@
-/* Automatically generated on Dec 6 2012, 10:04:49 */
+/* Automatically generated on Dec 13 2012, 16:51:04 */
extern sqExport vm_exports[];
extern sqExport os_exports[];
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Thu Dec 13 16:26:58 PST 2012
+ Thu Dec 13 16:58:00 PST 2012
Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixMain.c 2012-12-14 00:32:58 UTC (rev 2633)
+++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2012-12-14 00:58:29 UTC (rev 2634)
@@ -445,7 +445,7 @@
# endif
#endif
-static char *
+char *
GetAttributeString(sqInt id)
{
if (id < 0) /* VM argument */
1
0
[commit][2633] Document the fact that the previous checking applied the -z now link flag to the
by commits＠squeakvm.org 14 Dec '12
by commits＠squeakvm.org 14 Dec '12
14 Dec '12
Revision: 2633
Author: eliot
Date: 2012-12-13 16:32:58 -0800 (Thu, 13 Dec 2012)
Log Message:
-----------
Document the fact that the previous checking applied the -z now link flag to the
linux builds. This causes the dynamic linker to resolve unresolved symbols on
load instead of lazily. This affects reliability in signal handlers, because
if the dynamic linker can run at any time it can tehrefore run in a signal
handler and cause a deep call chain which could corrupt a stack page in the JIT.
So the previous checkin applied three fixes to this issue:
a) correct the stack headroom determination
b) use sigaltstack for signal handlers in the UnixOSProcessPlugin
c) link using -z now on linux.
Fix a warning due to expandDereferenceInterpreterProxyFunctionTable mis-translation.
Modified Paths:
--------------
branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c
branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c
branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c
branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c
branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c
branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c
branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c
branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c
branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c
branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c
branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c
branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c
branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c
branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c
branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cogmethod.h
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nscogsrc/vm/interp.h
branches/Cog/nscogsrc/vm/vmCallback.h
branches/Cog/platforms/Mac OS/vm/osExports.c
branches/Cog/platforms/unix/vm/osExports.c
branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c
branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c
branches/Cog/platforms/win32/vm/sqWin32Backtrace.c
branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c
branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c
branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c
branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c
branches/Cog/src/plugins/DSAPrims/DSAPrims.c
branches/Cog/src/plugins/DropPlugin/DropPlugin.c
branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c
branches/Cog/src/plugins/FT2Plugin/FT2Plugin.c
branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c
branches/Cog/src/plugins/FilePlugin/FilePlugin.c
branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c
branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c
branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c
branches/Cog/src/plugins/IA32ABI/IA32ABI.c
branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c
branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
branches/Cog/src/plugins/Klatt/Klatt.c
branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c
branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c
branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c
branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c
branches/Cog/src/plugins/RePlugin/RePlugin.c
branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c
branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c
branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c
branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c
branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c
branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c
branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c
branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogmethod.h
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/src/vm/interp.h
branches/Cog/src/vm/vmCallback.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- AsynchFilePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ AsynchFilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -110,9 +110,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AsynchFilePlugin VMMaker.oscog-eem.233 (i)"
+ "AsynchFilePlugin VMMaker.oscog-eem.234 (i)"
#else
- "AsynchFilePlugin VMMaker.oscog-eem.233 (e)"
+ "AsynchFilePlugin VMMaker.oscog-eem.234 (e)"
#endif
;
static void * sCOAFfn;
@@ -442,7 +442,7 @@
stackIntegerValue = interpreterProxy->stackIntegerValue;
stackValue = interpreterProxy->stackValue;
success = interpreterProxy->success;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- BalloonEnginePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ BalloonEnginePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -841,9 +841,9 @@
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin VMMaker.oscog-eem.233 (i)"
+ "B2DPlugin VMMaker.oscog-eem.234 (i)"
#else
- "B2DPlugin VMMaker.oscog-eem.233 (e)"
+ "B2DPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
static int* objBuffer;
@@ -11830,7 +11830,7 @@
storeIntegerofObjectwithValue = interpreterProxy->storeIntegerofObjectwithValue;
storePointerofObjectwithValue = interpreterProxy->storePointerofObjectwithValue;
topRemappableOop = interpreterProxy->topRemappableOop;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- BMPReadWriterPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ BMPReadWriterPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -86,9 +86,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BMPReadWriterPlugin VMMaker.oscog-eem.233 (i)"
+ "BMPReadWriterPlugin VMMaker.oscog-eem.234 (i)"
#else
- "BMPReadWriterPlugin VMMaker.oscog-eem.233 (e)"
+ "BMPReadWriterPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -253,7 +253,7 @@
slotSizeOf = interpreterProxy->slotSizeOf;
stackIntegerValue = interpreterProxy->stackIntegerValue;
stackObjectValue = interpreterProxy->stackObjectValue;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- BitBltSimulation VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ BitBltSimulation VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -333,9 +333,9 @@
};
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BitBltPlugin VMMaker.oscog-eem.233 (i)"
+ "BitBltPlugin VMMaker.oscog-eem.234 (i)"
#else
- "BitBltPlugin VMMaker.oscog-eem.233 (e)"
+ "BitBltPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
static sqInt noHalftone;
@@ -6504,7 +6504,7 @@
stackObjectValue = interpreterProxy->stackObjectValue;
stackValue = interpreterProxy->stackValue;
storeIntegerofObjectwithValue = interpreterProxy->storeIntegerofObjectwithValue;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c
===================================================================
--- branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- DSAPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ DSAPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -102,9 +102,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DSAPrims VMMaker.oscog-eem.233 (i)"
+ "DSAPrims VMMaker.oscog-eem.234 (i)"
#else
- "DSAPrims VMMaker.oscog-eem.233 (e)"
+ "DSAPrims VMMaker.oscog-eem.234 (e)"
#endif
;
static sqInt remainderDigitCount;
@@ -696,7 +696,7 @@
stSizeOf = interpreterProxy->stSizeOf;
stackObjectValue = interpreterProxy->stackObjectValue;
success = interpreterProxy->success;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- DropPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ DropPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -88,9 +88,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DropPlugin VMMaker.oscog-eem.233 (i)"
+ "DropPlugin VMMaker.oscog-eem.234 (i)"
#else
- "DropPlugin VMMaker.oscog-eem.233 (e)"
+ "DropPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -226,7 +226,7 @@
primitiveFail = interpreterProxy->primitiveFail;
push = interpreterProxy->push;
stackIntegerValue = interpreterProxy->stackIntegerValue;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- FileCopyPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ FileCopyPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -82,9 +82,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FileCopyPlugin VMMaker.oscog-eem.233 (i)"
+ "FileCopyPlugin VMMaker.oscog-eem.234 (i)"
#else
- "FileCopyPlugin VMMaker.oscog-eem.233 (e)"
+ "FileCopyPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -175,7 +175,7 @@
slotSizeOf = interpreterProxy->slotSizeOf;
stackValue = interpreterProxy->stackValue;
success = interpreterProxy->success;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- FilePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ FilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -182,9 +182,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FilePlugin VMMaker.oscog-eem.233 (i)"
+ "FilePlugin VMMaker.oscog-eem.234 (i)"
#else
- "FilePlugin VMMaker.oscog-eem.233 (e)"
+ "FilePlugin VMMaker.oscog-eem.234 (e)"
#endif
;
static void * sCCPfn;
@@ -1200,7 +1200,7 @@
tenuringIncrementalGC = interpreterProxy->tenuringIncrementalGC;
topRemappableOop = interpreterProxy->topRemappableOop;
trueObject = interpreterProxy->trueObject;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- FloatArrayPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ FloatArrayPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -120,9 +120,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatArrayPlugin VMMaker.oscog-eem.233 (i)"
+ "FloatArrayPlugin VMMaker.oscog-eem.234 (i)"
#else
- "FloatArrayPlugin VMMaker.oscog-eem.233 (e)"
+ "FloatArrayPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -741,7 +741,7 @@
stackObjectValue = interpreterProxy->stackObjectValue;
stackValue = interpreterProxy->stackValue;
success = interpreterProxy->success;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- FloatMathPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ FloatMathPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -101,9 +101,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatMathPlugin VMMaker.oscog-eem.233 (i)"
+ "FloatMathPlugin VMMaker.oscog-eem.234 (i)"
#else
- "FloatMathPlugin VMMaker.oscog-eem.233 (e)"
+ "FloatMathPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -646,7 +646,7 @@
pushFloat = interpreterProxy->pushFloat;
stackFloatValue = interpreterProxy->stackFloatValue;
stackIntegerValue = interpreterProxy->stackIntegerValue;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c
===================================================================
--- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- NewsqueakIA32ABIPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ NewsqueakIA32ABIPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -228,9 +228,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "IA32ABI VMMaker.oscog-eem.233 (i)"
+ "IA32ABI VMMaker.oscog-eem.234 (i)"
#else
- "IA32ABI VMMaker.oscog-eem.233 (e)"
+ "IA32ABI VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -2017,7 +2017,7 @@
stackPositiveMachineIntegerValue = interpreterProxy->stackPositiveMachineIntegerValue;
stackValue = interpreterProxy->stackValue;
trueObject = interpreterProxy->trueObject;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- JPEGReadWriter2Plugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ JPEGReadWriter2Plugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -111,9 +111,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReadWriter2Plugin VMMaker.oscog-eem.233 (i)"
+ "JPEGReadWriter2Plugin VMMaker.oscog-eem.234 (i)"
#else
- "JPEGReadWriter2Plugin VMMaker.oscog-eem.233 (e)"
+ "JPEGReadWriter2Plugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -750,7 +750,7 @@
stackValue = interpreterProxy->stackValue;
success = interpreterProxy->success;
trueObject = interpreterProxy->trueObject;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- JPEGReaderPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ JPEGReaderPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -188,9 +188,9 @@
static sqInt jsReadLimit;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReaderPlugin VMMaker.oscog-eem.233 (i)"
+ "JPEGReaderPlugin VMMaker.oscog-eem.234 (i)"
#else
- "JPEGReaderPlugin VMMaker.oscog-eem.233 (e)"
+ "JPEGReaderPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
static int *residuals;
@@ -1529,7 +1529,7 @@
stackObjectValue = interpreterProxy->stackObjectValue;
stackValue = interpreterProxy->stackValue;
storeIntegerofObjectwithValue = interpreterProxy->storeIntegerofObjectwithValue;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- LargeIntegersPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ LargeIntegersPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -181,9 +181,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "LargeIntegers v1.5 VMMaker.oscog-eem.233 (i)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.234 (i)"
#else
- "LargeIntegers v1.5 VMMaker.oscog-eem.233 (e)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.234 (e)"
#endif
;
static const int orOpIndex = 1;
@@ -3446,7 +3446,7 @@
stackValue = interpreterProxy->stackValue;
success = interpreterProxy->success;
trueObject = interpreterProxy->trueObject;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- Matrix2x3Plugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ Matrix2x3Plugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -125,9 +125,9 @@
static double m23ResultY;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Matrix2x3Plugin VMMaker.oscog-eem.233 (i)"
+ "Matrix2x3Plugin VMMaker.oscog-eem.234 (i)"
#else
- "Matrix2x3Plugin VMMaker.oscog-eem.233 (e)"
+ "Matrix2x3Plugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -811,7 +811,7 @@
slotSizeOf = interpreterProxy->slotSizeOf;
stackObjectValue = interpreterProxy->stackObjectValue;
storePointerofObjectwithValue = interpreterProxy->storePointerofObjectwithValue;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- MiscPrimitivePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ MiscPrimitivePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -87,9 +87,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MiscPrimitivePlugin VMMaker.oscog-eem.233 (i)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.234 (i)"
#else
- "MiscPrimitivePlugin VMMaker.oscog-eem.233 (e)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -942,7 +942,7 @@
ok = ((interpreterProxy->majorVersion()) == (VM_PROXY_MAJOR))
&& ((interpreterProxy->minorVersion()) >= (VM_PROXY_MINOR));
if (ok) {
- ;
+
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- RePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ RePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -134,9 +134,9 @@
static sqInt matchFlags;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "RePlugin VMMaker.oscog-eem.233 (i)"
+ "RePlugin VMMaker.oscog-eem.234 (i)"
#else
- "RePlugin VMMaker.oscog-eem.233 (e)"
+ "RePlugin VMMaker.oscog-eem.234 (e)"
#endif
;
static int netMemory = 0;
@@ -626,7 +626,7 @@
storeIntegerofObjectwithValue = interpreterProxy->storeIntegerofObjectwithValue;
storePointerofObjectwithValue = interpreterProxy->storePointerofObjectwithValue;
success = interpreterProxy->success;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- SecurityPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SecurityPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -104,9 +104,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SecurityPlugin VMMaker.oscog-eem.233 (i)"
+ "SecurityPlugin VMMaker.oscog-eem.234 (i)"
#else
- "SecurityPlugin VMMaker.oscog-eem.233 (e)"
+ "SecurityPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -353,7 +353,7 @@
popthenPush = interpreterProxy->popthenPush;
primitiveFail = interpreterProxy->primitiveFail;
pushBool = interpreterProxy->pushBool;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- SocketPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SocketPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -187,9 +187,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SocketPlugin VMMaker.oscog-eem.233 (i)"
+ "SocketPlugin VMMaker.oscog-eem.234 (i)"
#else
- "SocketPlugin VMMaker.oscog-eem.233 (e)"
+ "SocketPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
static void * sCCLOPfn;
@@ -2220,7 +2220,7 @@
storePointerofObjectwithValue = interpreterProxy->storePointerofObjectwithValue;
success = interpreterProxy->success;
trueObject = interpreterProxy->trueObject;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- SoundPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SoundPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -118,9 +118,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SoundPlugin VMMaker.oscog-eem.233 (i)"
+ "SoundPlugin VMMaker.oscog-eem.234 (i)"
#else
- "SoundPlugin VMMaker.oscog-eem.233 (e)"
+ "SoundPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -558,7 +558,7 @@
stackValue = interpreterProxy->stackValue;
storePointerofObjectwithValue = interpreterProxy->storePointerofObjectwithValue;
success = interpreterProxy->success;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- UUIDPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ UUIDPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -83,9 +83,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "UUIDPlugin VMMaker.oscog-eem.233 (i)"
+ "UUIDPlugin VMMaker.oscog-eem.234 (i)"
#else
- "UUIDPlugin VMMaker.oscog-eem.233 (e)"
+ "UUIDPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -170,7 +170,7 @@
methodArgumentCount = interpreterProxy->methodArgumentCount;
primitiveFail = interpreterProxy->primitiveFail;
stackObjectValue = interpreterProxy->stackObjectValue;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,5 +1,5 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 uuid: 79420af3-4595-4d68-8de0-e27fdd576dd4
*/
@@ -4177,7 +4177,7 @@
stackObjectValue = interpreterProxy->stackObjectValue;
stackValue = interpreterProxy->stackValue;
trueObject = interpreterProxy->trueObject;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- VMProfileMacSupportPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMProfileMacSupportPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -111,9 +111,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "VMProfileMacSupportPlugin VMMaker.oscog-eem.233 (i)"
+ "VMProfileMacSupportPlugin VMMaker.oscog-eem.234 (i)"
#else
- "VMProfileMacSupportPlugin VMMaker.oscog-eem.233 (e)"
+ "VMProfileMacSupportPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
@@ -295,7 +295,7 @@
stackValue = interpreterProxy->stackValue;
storePointerofObjectwithValue = interpreterProxy->storePointerofObjectwithValue;
topRemappableOop = interpreterProxy->topRemappableOop;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 uuid: 66e9d886-c656-4392-be32-84729d92e8b8
+ Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 uuid: 79420af3-4595-4d68-8de0-e27fdd576dd4
*/
-static char __buildInfo[] = "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 uuid: 66e9d886-c656-4392-be32-84729d92e8b8 " __DATE__ ;
+static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 uuid: 79420af3-4595-4d68-8de0-e27fdd576dd4 " __DATE__ ;
@@ -228,9 +228,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 (i)"
+ "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 (i)"
#else
- "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 (e)"
+ "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 (e)"
#endif
;
static int osprocessSandboxSecurity;
@@ -2022,7 +2022,7 @@
stackValue = interpreterProxy->stackValue;
storePointerofObjectwithValue = interpreterProxy->storePointerofObjectwithValue;
trueObject = interpreterProxy->trueObject;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- InflatePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ InflatePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "InflatePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "InflatePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
@@ -100,9 +100,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ZipPlugin VMMaker.oscog-eem.233 (i)"
+ "ZipPlugin VMMaker.oscog-eem.234 (i)"
#else
- "ZipPlugin VMMaker.oscog-eem.233 (e)"
+ "ZipPlugin VMMaker.oscog-eem.234 (e)"
#endif
;
static sqInt zipBitBuf;
@@ -283,7 +283,7 @@
slotSizeOf = interpreterProxy->slotSizeOf;
stackObjectValue = interpreterProxy->stackObjectValue;
storeIntegerofObjectwithValue = interpreterProxy->storeIntegerofObjectwithValue;
-#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */
}
return ok;
}
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/vm/cogit.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ StackToRegisterMappingCogit VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/vm/cogit.h 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/vm/cogmethod.h 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
typedef struct {
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- CoInterpreter VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1932,7 +1932,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
static usqInt heapBase;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.233";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.234";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
from
- CoInterpreter VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1935,7 +1935,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
static usqInt heapBase;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.233";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.234";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/vm/interp.h 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Dec 12 13:41:21 PST 2012
+ Thu Dec 13 16:26:58 PST 2012
Modified: branches/Cog/platforms/Mac OS/vm/osExports.c
===================================================================
--- branches/Cog/platforms/Mac OS/vm/osExports.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/platforms/Mac OS/vm/osExports.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,9 +1,6 @@
/* note: this file is only a backward compatible wrapper
-
for the old-style "platform.exports" definitions.
-
If your platform has migrated to the new exports
-
style you may as well insert the exports right here */
#include "sqVirtualMachine.h"
@@ -19,11 +16,9 @@
#endif
/* duh ... this is ugly */
-
#define XFN(export) {"", #export, (void*)export},
+#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export},
-#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export}
-
WindowPtr getSTWindow(void);
void setMessageHook(eventMessageHook theHook);
void setPostMessageHook(eventMessageHook theHook);
@@ -45,7 +40,6 @@
#endif
void *os_exports[][3] = {
-
XFN(getSTWindow)
XFN(setMessageHook)
XFN(setPostMessageHook)
@@ -66,16 +60,14 @@
/* Plugin support primitives
We should make these primitives a proper plugin
but right now we just need the exports. */
-XFN(primitivePluginBrowserReady)
+ XFN(primitivePluginBrowserReady)
#ifdef ENABLE_URL_FETCH
-XFN(primitivePluginRequestURLStream)
-XFN(primitivePluginRequestURL)
-XFN(primitivePluginPostURL)
-XFN(primitivePluginRequestFileHandle)
-XFN(primitivePluginDestroyRequest)
-XFN(primitivePluginRequestState)
+ XFN(primitivePluginRequestURLStream)
+ XFN(primitivePluginRequestURL)
+ XFN(primitivePluginPostURL)
+ XFN(primitivePluginRequestFileHandle)
+ XFN(primitivePluginDestroyRequest)
+ XFN(primitivePluginRequestState)
#endif
{NULL, NULL, NULL}
-
};
-
Modified: branches/Cog/platforms/unix/vm/osExports.c
===================================================================
--- branches/Cog/platforms/unix/vm/osExports.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/platforms/unix/vm/osExports.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -1,8 +1,6 @@
-#include <stdio.h>
+#define XFN(export) {"", #export, (void*)export},
+#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export},
-#define XFN(export) {"", #export, (void*)export}
-#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export}
-
char * GetAttributeString(int id);
#if !defined(HEADLESS)
int primitivePluginBrowserReady(void);
@@ -20,15 +18,15 @@
{
XFN(GetAttributeString)
#if !defined(HEADLESS)
- XFN(primitivePluginBrowserReady),
- XFN(primitivePluginRequestURLStream),
- XFN(primitivePluginRequestURL),
- XFN(primitivePluginPostURL),
- XFN(primitivePluginRequestFileHandle),
- XFN(primitivePluginDestroyRequest),
- XFN(primitivePluginRequestState),
- XFN(ioGetDisplay),
- XFN(ioGetWindow),
+ XFN(primitivePluginBrowserReady)
+ XFN(primitivePluginRequestURLStream)
+ XFN(primitivePluginRequestURL)
+ XFN(primitivePluginPostURL)
+ XFN(primitivePluginRequestFileHandle)
+ XFN(primitivePluginDestroyRequest)
+ XFN(primitivePluginRequestState)
+ XFN(ioGetDisplay)
+ XFN(ioGetWindow)
#endif
{ 0, 0, 0 }
};
Modified: branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c 2012-12-12 21:45:24 UTC (rev 2632)
+++ branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c 2012-12-14 00:32:58 UTC (rev 2633)
@@ -372,13 +372,16 @@
#endif
}
-#define NEED_SIGALTSTACK 1 /* for safety; some time need to turn off and test */
+/* Especially useful on linux when LD_BIND_NOW is not in effect and the
+ * dynamic linker happens to run in a signal handler.
+ */
+#define NEED_SIGALTSTACK 1
#if NEED_SIGALTSTACK
/* If the ticker is run from the heartbeat signal handler one needs to use an
* alternative stack to avoid overflowing the VM's stack pages. Keep
* the structure around for reference during debugging.
*/
@@ Diff output truncated at 50000 characters. @@
1
0
[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 12 Dec '12
by squeak-dev-noreply＠lists.squeakfoundation.org 12 Dec '12
12 Dec '12
Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin:
http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces…
==================== Summary ====================
Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38
Author: eem
Time: 12 December 2012, 1:34:04 am
UUID: 79420af3-4595-4d68-8de0-e27fdd576dd4
Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37
Get plugin to use SA_ONSTACK/sigaltstack for signal handlers
if loaded in the JIT. Correct some of the signal numbers.
Depends on VMMaker.oscog-eem.233 as it no longer uses asSymbol.
1
0
Revision: 2632
Author: eliot
Date: 2012-12-12 13:45:24 -0800 (Wed, 12 Dec 2012)
Log Message:
-----------
CogVM source as per VMMaker-eem.233.
Rename misnamed internameIsMutable: and internalIsImmutable:
to isOopMutable: and isOopImmutable:. Affects sqVirtualMachine.c,
but only part of api used in Newspeak VMs.
Merge LargeInteger primitive fixes from VMMaker-dtl.286 and
tests from VMMaker-dtl.289.
UnixOSProcessPlugin:
Merge with VMConstruction-Plugins-OSProcessPlugin-dtl.35.
In particular restore missing code to forwardSignal:toSemaphoreAt:
Get plugin to use SA_ONSTACK/sigaltstack for signal handlers
if loaded in the JIT.
Modified Paths:
--------------
branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c
branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c
branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c
branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c
branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c
branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c
branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c
branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c
branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c
branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c
branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c
branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c
branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c
branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c
branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cogmethod.h
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nscogsrc/vm/interp.h
branches/Cog/nscogsrc/vm/vmCallback.h
branches/Cog/platforms/unix/vm/osExports.c
branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c
branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c
branches/Cog/platforms/win32/vm/sqWin32Exports.c
branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c
branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c
branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c
branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c
branches/Cog/src/plugins/DSAPrims/DSAPrims.c
branches/Cog/src/plugins/DropPlugin/DropPlugin.c
branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c
branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c
branches/Cog/src/plugins/FilePlugin/FilePlugin.c
branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c
branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c
branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c
branches/Cog/src/plugins/IA32ABI/IA32ABI.c
branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c
branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
branches/Cog/src/plugins/Klatt/Klatt.c
branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c
branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c
branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c
branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c
branches/Cog/src/plugins/RePlugin/RePlugin.c
branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c
branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c
branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c
branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c
branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c
branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c
branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c
branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogmethod.h
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/exampleSqNamedPrims.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/src/vm/interp.h
branches/Cog/src/vm/vmCallback.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- AsynchFilePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ AsynchFilePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -110,9 +110,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AsynchFilePlugin VMMaker.oscog-eem.232 (i)"
+ "AsynchFilePlugin VMMaker.oscog-eem.233 (i)"
#else
- "AsynchFilePlugin VMMaker.oscog-eem.232 (e)"
+ "AsynchFilePlugin VMMaker.oscog-eem.233 (e)"
#endif
;
static void * sCOAFfn;
Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- BalloonEnginePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ BalloonEnginePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -841,9 +841,9 @@
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin VMMaker.oscog-eem.232 (i)"
+ "B2DPlugin VMMaker.oscog-eem.233 (i)"
#else
- "B2DPlugin VMMaker.oscog-eem.232 (e)"
+ "B2DPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
static int* objBuffer;
Modified: branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- BMPReadWriterPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ BMPReadWriterPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -86,9 +86,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BMPReadWriterPlugin VMMaker.oscog-eem.232 (i)"
+ "BMPReadWriterPlugin VMMaker.oscog-eem.233 (i)"
#else
- "BMPReadWriterPlugin VMMaker.oscog-eem.232 (e)"
+ "BMPReadWriterPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- BitBltSimulation VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ BitBltSimulation VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -333,9 +333,9 @@
};
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BitBltPlugin VMMaker.oscog-eem.232 (i)"
+ "BitBltPlugin VMMaker.oscog-eem.233 (i)"
#else
- "BitBltPlugin VMMaker.oscog-eem.232 (e)"
+ "BitBltPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
static sqInt noHalftone;
Modified: branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c
===================================================================
--- branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- DSAPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ DSAPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -102,9 +102,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DSAPrims VMMaker.oscog-eem.232 (i)"
+ "DSAPrims VMMaker.oscog-eem.233 (i)"
#else
- "DSAPrims VMMaker.oscog-eem.232 (e)"
+ "DSAPrims VMMaker.oscog-eem.233 (e)"
#endif
;
static sqInt remainderDigitCount;
Modified: branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- DropPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ DropPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -88,9 +88,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DropPlugin VMMaker.oscog-eem.232 (i)"
+ "DropPlugin VMMaker.oscog-eem.233 (i)"
#else
- "DropPlugin VMMaker.oscog-eem.232 (e)"
+ "DropPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- FileCopyPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ FileCopyPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -82,9 +82,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FileCopyPlugin VMMaker.oscog-eem.232 (i)"
+ "FileCopyPlugin VMMaker.oscog-eem.233 (i)"
#else
- "FileCopyPlugin VMMaker.oscog-eem.232 (e)"
+ "FileCopyPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- FilePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ FilePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -182,9 +182,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FilePlugin VMMaker.oscog-eem.232 (i)"
+ "FilePlugin VMMaker.oscog-eem.233 (i)"
#else
- "FilePlugin VMMaker.oscog-eem.232 (e)"
+ "FilePlugin VMMaker.oscog-eem.233 (e)"
#endif
;
static void * sCCPfn;
Modified: branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- FloatArrayPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ FloatArrayPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -120,9 +120,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatArrayPlugin VMMaker.oscog-eem.232 (i)"
+ "FloatArrayPlugin VMMaker.oscog-eem.233 (i)"
#else
- "FloatArrayPlugin VMMaker.oscog-eem.232 (e)"
+ "FloatArrayPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- FloatMathPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ FloatMathPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -101,9 +101,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatMathPlugin VMMaker.oscog-eem.232 (i)"
+ "FloatMathPlugin VMMaker.oscog-eem.233 (i)"
#else
- "FloatMathPlugin VMMaker.oscog-eem.232 (e)"
+ "FloatMathPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c
===================================================================
--- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- NewsqueakIA32ABIPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ NewsqueakIA32ABIPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -228,9 +228,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "IA32ABI VMMaker.oscog-eem.232 (i)"
+ "IA32ABI VMMaker.oscog-eem.233 (i)"
#else
- "IA32ABI VMMaker.oscog-eem.232 (e)"
+ "IA32ABI VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- JPEGReadWriter2Plugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ JPEGReadWriter2Plugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -111,9 +111,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReadWriter2Plugin VMMaker.oscog-eem.232 (i)"
+ "JPEGReadWriter2Plugin VMMaker.oscog-eem.233 (i)"
#else
- "JPEGReadWriter2Plugin VMMaker.oscog-eem.232 (e)"
+ "JPEGReadWriter2Plugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- JPEGReaderPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ JPEGReaderPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -188,9 +188,9 @@
static sqInt jsReadLimit;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReaderPlugin VMMaker.oscog-eem.232 (i)"
+ "JPEGReaderPlugin VMMaker.oscog-eem.233 (i)"
#else
- "JPEGReaderPlugin VMMaker.oscog-eem.232 (e)"
+ "JPEGReaderPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
static int *residuals;
Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- LargeIntegersPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ LargeIntegersPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -181,9 +181,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "LargeIntegers v1.5 VMMaker.oscog-eem.232 (i)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.233 (i)"
#else
- "LargeIntegers v1.5 VMMaker.oscog-eem.232 (e)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.233 (e)"
#endif
;
static const int orOpIndex = 1;
Modified: branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- Matrix2x3Plugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ Matrix2x3Plugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -125,9 +125,9 @@
static double m23ResultY;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Matrix2x3Plugin VMMaker.oscog-eem.232 (i)"
+ "Matrix2x3Plugin VMMaker.oscog-eem.233 (i)"
#else
- "Matrix2x3Plugin VMMaker.oscog-eem.232 (e)"
+ "Matrix2x3Plugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- MiscPrimitivePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ MiscPrimitivePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -87,9 +87,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MiscPrimitivePlugin VMMaker.oscog-eem.232 (i)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.233 (i)"
#else
- "MiscPrimitivePlugin VMMaker.oscog-eem.232 (e)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- RePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ RePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -134,9 +134,9 @@
static sqInt matchFlags;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "RePlugin VMMaker.oscog-eem.232 (i)"
+ "RePlugin VMMaker.oscog-eem.233 (i)"
#else
- "RePlugin VMMaker.oscog-eem.232 (e)"
+ "RePlugin VMMaker.oscog-eem.233 (e)"
#endif
;
static int netMemory = 0;
Modified: branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- SecurityPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SecurityPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -104,9 +104,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SecurityPlugin VMMaker.oscog-eem.232 (i)"
+ "SecurityPlugin VMMaker.oscog-eem.233 (i)"
#else
- "SecurityPlugin VMMaker.oscog-eem.232 (e)"
+ "SecurityPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- SocketPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SocketPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -187,9 +187,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SocketPlugin VMMaker.oscog-eem.232 (i)"
+ "SocketPlugin VMMaker.oscog-eem.233 (i)"
#else
- "SocketPlugin VMMaker.oscog-eem.232 (e)"
+ "SocketPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
static void * sCCLOPfn;
Modified: branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- SoundPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SoundPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -118,9 +118,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SoundPlugin VMMaker.oscog-eem.232 (i)"
+ "SoundPlugin VMMaker.oscog-eem.233 (i)"
#else
- "SoundPlugin VMMaker.oscog-eem.232 (e)"
+ "SoundPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- UUIDPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ UUIDPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -83,9 +83,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "UUIDPlugin VMMaker.oscog-eem.232 (i)"
+ "UUIDPlugin VMMaker.oscog-eem.233 (i)"
#else
- "UUIDPlugin VMMaker.oscog-eem.232 (e)"
+ "UUIDPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 uuid: 66e9d886-c656-4392-be32-84729d92e8b8
+ UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 uuid: 79420af3-4595-4d68-8de0-e27fdd576dd4
*/
-static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 uuid: 66e9d886-c656-4392-be32-84729d92e8b8 " __DATE__ ;
+static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 uuid: 79420af3-4595-4d68-8de0-e27fdd576dd4 " __DATE__ ;
@@ -104,6 +104,7 @@
static sqInt maskSignalForThisThread(int sigNum);
EXPORT(sqInt) moduleUnloaded(char *aModuleName);
static sqInt msg(char *s);
+static sqInt needSigaltstack(void);
static sqInt newPthreadTypeByteArray(pthread_t aPthreadType);
static sqInt newSQFileByteArray(void);
static sqInt newSQSocketByteArray(void);
@@ -210,7 +211,7 @@
static void setSigChldHandler(void);
static void setSigIntDefaultHandler(void);
static void setSigIntIgnore(void);
-static void * setSignalNumberhandler(sqInt anInteger, void *signalHandlerAddress);
+static void * setSignalNumberhandler(sqInt signalNumber, sqInt signalHandlerAddress);
static void setSigPipeDefaultHandler(void);
static sqInt setSigPipeHandler(void);
static void setSigPipeIgnore(void);
@@ -221,6 +222,7 @@
static sqInt sigContNumber(void);
static void * sigDefaultNumber(void);
static void * sigErrorNumber(void);
+static void * sigHoldNumber(void);
static sqInt sigHupNumber(void);
static void * sigIgnoreNumber(void);
static sqInt sigIntNumber(void);
@@ -321,9 +323,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 (i)"
+ "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 (i)"
#else
- "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 (e)"
+ "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 (e)"
#endif
;
static void *originalSigHandlers[NSIG];
@@ -334,6 +336,7 @@
static sqInt sigChldSemaIndex;
static void *sigHandlers[NSIG];
static int sigNumToSend = SIGTERM;
+static sqInt useSignalStack;
static pthread_t vmThread;
@@ -690,7 +693,6 @@
char *pwdPtr;
struct itimerval saveIntervalTimer;
sqInt sigNum;
- void *signalHandlerAddress;
sqInt stdErr;
sqInt stdIn;
sqInt stdOut;
@@ -806,9 +808,7 @@
sigNum = 1;
while (sigNum <= (signalArraySize())) {
if ((semaIndices[sigNum]) > 0) {
- /* begin setSignalNumber:handler: */
- signalHandlerAddress = (originalSignalHandlers())[sigNum];
- signal(sigNum, signalHandlerAddress);
+ setSignalNumberhandler(sigNum, (originalSignalHandlers())[sigNum]);
}
sigNum += 1;
}
@@ -926,7 +926,6 @@
forwardSignaltoSemaphoreAt(sqInt sigNum, sqInt semaphoreIndex)
{
void *oldHandler;
- void *signalHandlerAddress;
if (semaIndices == null) {
return null;
@@ -937,8 +936,7 @@
if ((semaIndices[sigNum]) != 0) {
oldHandler = (originalSignalHandlers())[sigNum];
- /* begin setSignalNumber:handler: */
- oldHandler = signal(sigNum, oldHandler);
+ oldHandler = setSignalNumberhandler(sigNum, oldHandler);
semaIndices[sigNum] = 0;
return oldHandler;
}
@@ -947,19 +945,18 @@
/* either -1 for printAllStacks or a positive integer for semaphore forwarding */
/* Signal handler had not been set, answer an error */
- return sigErrorNumber();
+ /* begin sigErrorNumber */
+ return SIG_ERR;
}
}
if ((semaIndices[sigNum]) > 0) {
/* Handler is already set, answer an error */
- return sigErrorNumber();
+ /* begin sigErrorNumber */
+ return SIG_ERR;
}
- /* begin setSignalNumber:handler: */
- /* begin handleSignalFunctionAddress */
- signalHandlerAddress = handleSignal;
- oldHandler = signal(sigNum, signalHandlerAddress);
+ oldHandler = setSignalNumberhandler(sigNum, handleSignalFunctionAddress());
if (oldHandler != (sigErrorNumber())) {
(originalSignalHandlers())[sigNum] = oldHandler;
semaIndices[sigNum] = semaphoreIndex;
@@ -1075,6 +1072,7 @@
pidCount = 0;
atexit(sendSignalToPids);
vmThread = pthread_self();
+ useSignalStack = -1;
}
@@ -1181,16 +1179,11 @@
static sqInt
makePipeForReaderwriter(FILEHANDLETYPE *readerIOStreamPtr, FILEHANDLETYPE *writerIOStreamPtr)
{
- sqInt anInteger;
int filedes[2];
- void *signalHandlerAddress;
/* begin setSigPipeHandler */
/* begin setSigPipeIgnore */
- /* begin setSignalNumber:handler: */
- anInteger = sigPipeNumber();
- signalHandlerAddress = sigIgnoreNumber();
- signal(anInteger, signalHandlerAddress);
+ setSignalNumberhandler(SIGPIPE, sigIgnoreNumber());
if ((pipe(filedes)) == -1) {
/* Translates to a pipe() system call */
@@ -1251,6 +1244,67 @@
}
+/* Answer if the plugin should use a signalstack to avoid delivering signals
+ on the native stack, which can interfere with the JIT. As a side-effect,
+ allocate one if one is not already available. We use GetAttributeString
+ to detect the JIT, and if so detected we use a signalstack, We reuse
+ any existing signalstack if available. */
+
+static sqInt
+needSigaltstack(void)
+{
+ char * (*GetAttributeString)(int);
+ sqInt SigStackSize;
+ stack_t sigstack;
+
+ if (useSignalStack >= 0) {
+ return useSignalStack != 0;
+ }
+ GetAttributeString = ioLoadFunctionFrom("GetAttributeString", "os_exports");
+ if ((GetAttributeString == null)
+ || ((GetAttributeString(1008)) == null)) {
+ useSignalStack = 0;
+ return 0;
+ }
+
+ /* Now see if there's already a sigaltstack in place */
+
+ useSignalStack = 1;
+ if ((sigaltstack(0,&sigstack)) < 0) {
+ perror("sigaltstack");
+ }
+
+# if defined(SA_DISABLE)
+ if (!(sigstack.ss_size == 0 || (sigstack.ss_flags & SA_DISABLE))) {
+ return 1;
+ }
+
+# else /* defined(SA_DISABLE) */
+
+ /* e.g. Mac OS documents SA_DISABLE but defines SS_DISABLE */
+
+ if (!(sigstack.ss_size == 0 || (sigstack.ss_flags & SS_DISABLE))) {
+ return 1;
+ }
+
+# endif /* defined(SA_DISABLE) */
+
+ SigStackSize = ((((1024 * (sizeof(void *))) * 16) < (MINSIGSTKSZ)) ? (MINSIGSTKSZ) : ((1024 * (sizeof(void *))) * 16));
+ if (null == (sigstack.ss_size = SigStackSize, sigstack.ss_sp = malloc(SigStackSize))) {
+ msg("sigstack malloc failed");
+ useSignalStack = 0;
+ return 0;
+ }
+ if (sigaltstack(&sigstack, 0) < 0) {
+ msg("sigaltstack install failed");
+ (void)free(sigstack.ss_sp);
+ useSignalStack = 0;
+ return 0;
+ }
+ return 1;
+}
+
+
/* A pthread_t is an unsigned long, which may be 8 bytes on some 64 bit
platforms. This stores the value in a byte array that can be easily
passed to the image. */
@@ -2712,7 +2766,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -2724,9 +2777,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigAbrtNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGABRT);
pop(2);
pushInteger(result);
}
@@ -2750,7 +2801,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -2762,9 +2812,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigAlrmNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGALRM);
pop(2);
pushInteger(result);
}
@@ -2789,7 +2837,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -2801,9 +2848,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigChldNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGCHLD);
pop(2);
pushInteger(result);
}
@@ -2827,7 +2872,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -2839,9 +2883,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigContNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGCONT);
pop(2);
pushInteger(result);
}
@@ -2864,7 +2906,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -2876,9 +2917,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigHupNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGHUP);
pop(2);
pushInteger(result);
}
@@ -2902,7 +2941,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -2914,9 +2952,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigIntNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGINT);
pop(2);
pushInteger(result);
}
@@ -2940,7 +2976,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -2952,9 +2987,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigKillNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGKILL);
pop(2);
pushInteger(result);
}
@@ -2978,7 +3011,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -2990,9 +3022,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigPipeNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGPIPE);
pop(2);
pushInteger(result);
}
@@ -3015,7 +3045,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -3027,9 +3056,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigQuitNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGQUIT);
pop(2);
pushInteger(result);
}
@@ -3053,7 +3080,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -3065,9 +3091,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigStopNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGSTOP);
pop(2);
pushInteger(result);
}
@@ -3091,7 +3115,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -3103,9 +3126,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigTermNumber();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGTERM);
pop(2);
pushInteger(result);
}
@@ -3129,7 +3150,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -3141,9 +3161,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigUsr1Number();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGUSR1);
pop(2);
pushInteger(result);
}
@@ -3167,7 +3185,6 @@
{
pid_t pidToSignal;
int result;
- sqInt sig;
/* Do not allow signal sending if running in secure mode */
@@ -3179,9 +3196,7 @@
else {
if (isIntegerObject(stackValue(0))) {
pidToSignal = stackIntegerValue(0);
- /* begin sendSignal:toPid: */
- sig = sigUsr2Number();
- result = ((sqInt) (kill(pidToSignal, sig)));
+ result = kill(pidToSignal, SIGUSR2);
pop(2);
pushInteger(result);
}
@@ -3275,7 +3290,7 @@
primitiveSigChldNumber(void)
{
pop(1);
- pushInteger(sigChldNumber());
+ pushInteger(SIGCHLD);
}
@@ -3285,7 +3300,7 @@
primitiveSigHupNumber(void)
{
pop(1);
- pushInteger(sigHupNumber());
+ pushInteger(SIGHUP);
}
@@ -3295,7 +3310,7 @@
primitiveSigIntNumber(void)
{
pop(1);
- pushInteger(sigIntNumber());
+ pushInteger(SIGINT);
}
@@ -3305,7 +3320,7 @@
primitiveSigKillNumber(void)
{
pop(1);
- pushInteger(sigKillNumber());
+ pushInteger(SIGKILL);
}
@@ -3315,7 +3330,7 @@
primitiveSigPipeNumber(void)
{
pop(1);
- pushInteger(sigPipeNumber());
+ pushInteger(SIGPIPE);
}
@@ -3325,7 +3340,7 @@
primitiveSigQuitNumber(void)
{
pop(1);
- pushInteger(sigQuitNumber());
+ pushInteger(SIGQUIT);
}
@@ -3335,7 +3350,7 @@
primitiveSigTermNumber(void)
{
pop(1);
- pushInteger(sigTermNumber());
+ pushInteger(SIGTERM);
}
@@ -3345,7 +3360,7 @@
primitiveSigUsr1Number(void)
{
pop(1);
- pushInteger(sigUsr1Number());
+ pushInteger(SIGUSR1);
}
@@ -3355,7 +3370,7 @@
primitiveSigUsr2Number(void)
{
pop(1);
- pushInteger(sigUsr2Number());
+ pushInteger(SIGUSR2);
}
@@ -3982,7 +3997,6 @@
restoreDefaultSignalHandlers(void)
{
sqInt sigNum;
- void *signalHandlerAddress;
if (!(semaIndices == null)) {
@@ -3991,9 +4005,7 @@
sigNum = 1;
while (sigNum <= (signalArraySize())) {
if ((semaIndices[sigNum]) > 0) {
- /* begin setSignalNumber:handler: */
- signalHandlerAddress = (originalSignalHandlers())[sigNum];
- signal(sigNum, signalHandlerAddress);
+ setSignalNumberhandler(sigNum, (originalSignalHandlers())[sigNum]);
}
sigNum += 1;
}
@@ -4176,35 +4188,31 @@
static void
setSigChldHandler(void)
{
- struct sigaction sigchldHanderAction;
+ struct sigaction sigchldHandlerAction;
-#if defined(SA_NOCLDSTOP)
- sigchldHanderAction.sa_sigaction = reapChildProcess;
- sigchldHanderAction.sa_flags = SA_NODEFER | SA_NOCLDSTOP;
- sigemptyset(&sigchldHanderAction.sa_mask);
- if ((sigaction(SIGCHLD, &sigchldHanderAction, 0)) == (sigErrorNumber())) {
- perror("signal");
+# if defined(SA_NOCLDSTOP)
+ sigchldHandlerAction.sa_sigaction = reapChildProcess;
+ sigchldHandlerAction.sa_flags = SA_NODEFER | SA_NOCLDSTOP;
+ if (needSigaltstack()) {
+ sigchldHandlerAction.sa_flags |= SA_ONSTACK;
}
-
-#else /* defined(SA_NOCLDSTOP) */
- if ((signal(SIGCHLD, reapChildProcess)) == (sigErrorNumber())) {
+ sigemptyset(&sigchldHandlerAction.sa_mask);
+ if ((sigaction(SIGCHLD, &sigchldHandlerAction, 0)) == (sigErrorNumber())) {
perror("signal");
}
-
-#endif /* defined(SA_NOCLDSTOP) */
+
+# else /* defined(SA_NOCLDSTOP) */
+ setSignalNumberhandler(SIGCHLD, reapChildProcess);
+
+# endif /* defined(SA_NOCLDSTOP) */
+
}
static void
setSigIntDefaultHandler(void)
{
- sqInt anInteger;
- void *signalHandlerAddress;
-
- /* begin setSignalNumber:handler: */
- anInteger = sigIntNumber();
- signalHandlerAddress = sigDefaultNumber();
- signal(anInteger, signalHandlerAddress);
+ setSignalNumberhandler(SIGINT, sigDefaultNumber());
}
@@ -4213,13 +4221,7 @@
static void
setSigIntIgnore(void)
{
- sqInt anInteger;
- void *signalHandlerAddress;
-
- /* begin setSignalNumber:handler: */
- anInteger = sigIntNumber();
- signalHandlerAddress = sigIgnoreNumber();
- signal(anInteger, signalHandlerAddress);
+ setSignalNumberhandler(SIGINT, sigIgnoreNumber());
}
@@ -4228,21 +4230,27 @@
*/
static void *
-setSignalNumberhandler(sqInt anInteger, void *signalHandlerAddress)
+setSignalNumberhandler(sqInt signalNumber, sqInt signalHandlerAddress)
{
- return signal(anInteger, signalHandlerAddress);
+ struct sigaction oldHandlerAction;
+ struct sigaction sigHandlerAction;
+
+ if (!useSignalStack) {
+ return signal(signalNumber, signalHandlerAddress);
+ }
+ sigHandlerAction.sa_sigaction = signalHandlerAddress;
+ sigHandlerAction.sa_flags = SA_ONSTACK | SA_RESTART;
+ sigemptyset(&sigHandlerAction.sa_mask);
+ if ((sigaction(signalNumber, (&sigHandlerAction), (&oldHandlerAction))) == (sigErrorNumber())) {
+ perror("signal");
+ }
+ return oldHandlerAction.sa_sigaction;
}
static void
setSigPipeDefaultHandler(void)
{
- sqInt anInteger;
- void *signalHandlerAddress;
-
- /* begin setSignalNumber:handler: */
- anInteger = sigPipeNumber();
- signalHandlerAddress = sigDefaultNumber();
- signal(anInteger, signalHandlerAddress);
+ setSignalNumberhandler(SIGPIPE, sigDefaultNumber());
}
@@ -4257,14 +4265,8 @@
static sqInt
setSigPipeHandler(void)
{
- sqInt anInteger;
- void *signalHandlerAddress;
-
/* begin setSigPipeIgnore */
- /* begin setSignalNumber:handler: */
- anInteger = sigPipeNumber();
- signalHandlerAddress = sigIgnoreNumber();
- signal(anInteger, signalHandlerAddress);
+ setSignalNumberhandler(SIGPIPE, sigIgnoreNumber());
}
@@ -4275,20 +4277,13 @@
static void
setSigPipeIgnore(void)
{
- sqInt anInteger;
- void *signalHandlerAddress;
-
- /* begin setSignalNumber:handler: */
- anInteger = sigPipeNumber();
- signalHandlerAddress = sigIgnoreNumber();
- signal(anInteger, signalHandlerAddress);
+ setSignalNumberhandler(SIGPIPE, sigIgnoreNumber());
}
EXPORT(sqInt)
shutdownModule(void)
{
sqInt sigNum;
- void *signalHandlerAddress;
/* begin restoreDefaultSignalHandlers */
if (!(semaIndices == null)) {
@@ -4298,9 +4293,7 @@
sigNum = 1;
while (sigNum <= (signalArraySize())) {
if ((semaIndices[sigNum]) > 0) {
- /* begin setSignalNumber:handler: */
- signalHandlerAddress = (originalSignalHandlers())[sigNum];
- signal(sigNum, signalHandlerAddress);
+ setSignalNumberhandler(sigNum, (originalSignalHandlers())[sigNum]);
}
sigNum += 1;
}
@@ -4362,6 +4355,15 @@
}
+/* Hold action for a signal */
+
+static void *
+sigHoldNumber(void)
+{
+ return SIG_HOLD;
+}
+
+
/* Hangup detected on controlling terminal or death of controlling process */
static sqInt
@@ -4457,7 +4459,7 @@
/* User defined signal number 1. This is value is platform-dependent, so the
- inSmalltalk default of 10 may be wrong on some platforms. */
+ inSmalltalk default of 30 may be wrong on some platforms. */
static sqInt
sigUsr1Number(void)
@@ -4467,7 +4469,7 @@
/* User defined signal number 2. This is value is platform-dependent, so the
- inSmalltalk default of 12 may be wrong on some platforms. */
+ inSmalltalk default of 32 may be wrong on some platforms. */
static sqInt
sigUsr2Number(void)
Modified: branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- VMProfileMacSupportPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMProfileMacSupportPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
*/
-static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
+static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211 " __DATE__ ;
@@ -111,9 +111,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "VMProfileMacSupportPlugin VMMaker.oscog-eem.232 (i)"
+ "VMProfileMacSupportPlugin VMMaker.oscog-eem.233 (i)"
#else
- "VMProfileMacSupportPlugin VMMaker.oscog-eem.232 (e)"
+ "VMProfileMacSupportPlugin VMMaker.oscog-eem.233 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
- Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 uuid: 66e9d886-c656-4392-be32-84729d92e8b8
+ Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 uuid: 66e9d886-c656-4392-be32-84729d92e8b8
*/
-static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 uuid: 66e9d886-c656-4392-be32-84729d92e8b8 " __DATE__ ;
+static char __buildInfo[] = "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 uuid: 66e9d886-c656-4392-be32-84729d92e8b8 " __DATE__ ;
@@ -228,9 +228,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 (i)"
+ "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 (i)"
#else
- "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 (e)"
+ "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 (e)"
#endif
;
static int osprocessSandboxSecurity;
Modified: branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
+++ branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2012-12-12 21:45:24 UTC (rev 2632)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
+ VMPluginCodeGenerator VMMaker.oscog-eem.233 uuid: 8720e836-68d5-48bd-a664-5d39a9e2e211
from
@@ Diff output truncated at 50000 characters. @@
1
0
[commit][2631] Fix stackPage headroom calculation in CoInterpreter.
by commits＠squeakvm.org 12 Dec '12
by commits＠squeakvm.org 12 Dec '12
12 Dec '12
Revision: 2631
Author: eliot
Date: 2012-12-11 18:04:46 -0800 (Tue, 11 Dec 2012)
Log Message:
-----------
Fix stackPage headroom calculation in CoInterpreter. Was getting
things backward. This increases the stack page headroom by 62%
from 1564 bytes to 2532 bytes. Shootout benchmarks unchanged,
so reduction in frames per page is not an issue for typical code.
This should result in fewer crashes on linux where the dynamic
linker, if it kicked in during a signal handler, could cause a deep
call chain at interrupt time and trample the start of the adjoining
stack page.
Merge LargeInteger primitive fixes from VMMaker-dtl.286.
Change generation of plugin code so that internal plugins call VM
routines directly and external plugins call through their own local
copies of the function pointers in InterpreterProxy. External plugins
copy the InterpreterProxy functions to their local copies in
setInterpreter:.
Change implementations of stObject:at:put: to return their value, to
match the declaration in InterpreterProxy.
Streamline ObjectMemory>>instantiateClass:indexableSize: (hdrSize
and header3 change together).
Optimize the debug VM by making startOfMemory a macro that
answers heapBase instead of a method.
Improve stack page printing, and make stack trace printing more
robust (findClass/SelectorOfMethod:forReceiver:).
Make temporary:in:put: et al answer their values. For stObject:at:put:.
Make jumpTable size err message more explanatory.
Rename misnamed internameIsMutable: and internalIsImmutable:
to isOopMutable: and isOopImmutable:. Affects sqVirtualMachine.c,
but only part of api used in Newspeak VMs.
Modified Paths:
--------------
branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h
branches/Cog/nscogbuild/unixbuild/astbld/mvm
branches/Cog/nscogbuild/unixbuild/bld/mvm
branches/Cog/nscogbuild/unixbuild/dbgbld/mvm
branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c
branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c
branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c
branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c
branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c
branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c
branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c
branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c
branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c
branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c
branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c
branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c
branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c
branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c
branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cogmethod.h
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nscogsrc/vm/interp.h
branches/Cog/nscogsrc/vm/vmCallback.h
branches/Cog/platforms/Cross/vm/sqVirtualMachine.c
branches/Cog/platforms/Cross/vm/sqVirtualMachine.h
branches/Cog/platforms/win32/vm/sqGnu.h
branches/Cog/src/examplePlugins.ext
branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c
branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c
branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c
branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c
branches/Cog/src/plugins/DSAPrims/DSAPrims.c
branches/Cog/src/plugins/DropPlugin/DropPlugin.c
branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c
branches/Cog/src/plugins/FT2Plugin/FT2Plugin.c
branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c
branches/Cog/src/plugins/FilePlugin/FilePlugin.c
branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c
branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c
branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c
branches/Cog/src/plugins/IA32ABI/IA32ABI.c
branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c
branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
branches/Cog/src/plugins/Klatt/Klatt.c
branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c
branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c
branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c
branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c
branches/Cog/src/plugins/RePlugin/RePlugin.c
branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c
branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c
branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c
branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c
branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c
branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c
branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c
branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogmethod.h
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/exampleSqNamedPrims.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/src/vm/interp.h
branches/Cog/src/vm/vmCallback.h
branches/Cog/unixbuild/abld/mvm
branches/Cog/unixbuild/bld/mvm
branches/Cog/unixbuild/dbld/mvm
branches/Cog/unixbuild/mtbld/mvm
Added Paths:
-----------
branches/Cog/scripts/neutronbombprims
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h 2012-12-04 17:53:23 UTC (rev 2630)
+++ branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h 2012-12-12 02:04:46 UTC (rev 2631)
@@ -1,4 +1,4 @@
-/* Automatically generated on Jun 27 2011, 17:03:45 */
+/* Automatically generated on Dec 6 2012, 10:04:49 */
extern sqExport vm_exports[];
extern sqExport os_exports[];
Modified: branches/Cog/nscogbuild/unixbuild/astbld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/astbld/mvm 2012-12-04 17:53:23 UTC (rev 2630)
+++ branches/Cog/nscogbuild/unixbuild/astbld/mvm 2012-12-12 02:04:46 UTC (rev 2631)
@@ -8,7 +8,11 @@
n|no|N|NO) echo "ok but this isn't safe!!";;
*) make reallyclean
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" LIBS="-lpthread -luuid"
+test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \
+ --without-vm-display-fbdev --without-npsqueak \
+ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" \
+ LIBS="-lpthread -luuid" \
+ LDFLAGS=-Wl,-z,now
../../../scripts/nukeversion
rm -rf ../../../$INSTALLDIR
# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR`
Modified: branches/Cog/nscogbuild/unixbuild/bld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/bld/mvm 2012-12-04 17:53:23 UTC (rev 2630)
+++ branches/Cog/nscogbuild/unixbuild/bld/mvm 2012-12-12 02:04:46 UTC (rev 2631)
@@ -12,7 +12,11 @@
n|no|N|NO) echo "ok but this isn't safe!!";;
*) make reallyclean
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0" LIBS="-lpthread -luuid"
+test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \
+ --without-vm-display-fbdev --without-npsqueak \
+ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0" \
+ LIBS="-lpthread -luuid" \
+ LDFLAGS=-Wl,-z,now
../../../scripts/nukeversion
rm -rf ../../../$INSTALLDIR
# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR`
Modified: branches/Cog/nscogbuild/unixbuild/dbgbld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/dbgbld/mvm 2012-12-04 17:53:23 UTC (rev 2630)
+++ branches/Cog/nscogbuild/unixbuild/dbgbld/mvm 2012-12-12 02:04:46 UTC (rev 2631)
@@ -8,7 +8,11 @@
n|no|N|NO) echo "ok but this isn't safe!!";;
*) make reallyclean
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" LIBS="-lpthread -luuid"
+test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \
+ --without-vm-display-fbdev --without-npsqueak \
+ CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" \
+ LIBS="-lpthread -luuid" \
+ LDFLAGS=-Wl,-z,now
../../../scripts/nukeversion
rm -rf ../../../$INSTALLDIR
# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR`
Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-04 17:53:23 UTC (rev 2630)
+++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
from
- AsynchFilePlugin VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6
+ AsynchFilePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
*/
-static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6 " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
@@ -12,6 +12,11 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
/* Default EXPORT macro that does nothing (see comment in sq.h): */
#define EXPORT(returnType) returnType
@@ -35,6 +40,7 @@
#include "AsynchFilePlugin.h"
#include "sqMemoryAccess.h"
+#include "sqMemoryAccess.h"
/*** Constants ***/
@@ -62,15 +68,51 @@
/*** Variables ***/
-#ifdef SQUEAK_BUILTIN_PLUGIN
+#if !defined(SQUEAK_BUILTIN_PLUGIN)
+static sqInt (*booleanValueOf)(sqInt obj);
+static sqInt (*classByteArray)(void);
+static sqInt (*failed)(void);
+static void * (*firstIndexableField)(sqInt oop);
+static sqInt (*instantiateClassindexableSize)(sqInt classPointer, sqInt size);
+static sqInt (*integerObjectOf)(sqInt value);
+static void * (*ioLoadFunctionFrom)(char *functionName, char *moduleName);
+static sqInt (*isBytes)(sqInt oop);
+static sqInt (*isIntegerObject)(sqInt objectPointer);
+static sqInt (*isWords)(sqInt oop);
+static sqInt (*pop)(sqInt nItems);
+static sqInt (*popthenPush)(sqInt nItems, sqInt oop);
+static sqInt (*primitiveFail)(void);
+static sqInt (*slotSizeOf)(sqInt oop);
+static sqInt (*stackIntegerValue)(sqInt offset);
+static sqInt (*stackValue)(sqInt offset);
+static sqInt (*success)(sqInt aBoolean);
+#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */
+extern sqInt booleanValueOf(sqInt obj);
+extern sqInt classByteArray(void);
+extern sqInt failed(void);
+extern void * firstIndexableField(sqInt oop);
+extern sqInt instantiateClassindexableSize(sqInt classPointer, sqInt size);
+extern sqInt integerObjectOf(sqInt value);
+extern void * ioLoadFunctionFrom(char *functionName, char *moduleName);
+extern sqInt isBytes(sqInt oop);
+extern sqInt isIntegerObject(sqInt objectPointer);
+extern sqInt isWords(sqInt oop);
+extern sqInt pop(sqInt nItems);
+extern sqInt popthenPush(sqInt nItems, sqInt oop);
+extern sqInt primitiveFail(void);
+extern sqInt slotSizeOf(sqInt oop);
+extern sqInt stackIntegerValue(sqInt offset);
+extern sqInt stackValue(sqInt offset);
+extern sqInt success(sqInt aBoolean);
+
extern
#endif
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AsynchFilePlugin VMMaker.oscog-eem.222 (i)"
+ "AsynchFilePlugin VMMaker.oscog-eem.232 (i)"
#else
- "AsynchFilePlugin VMMaker.oscog-eem.222 (e)"
+ "AsynchFilePlugin VMMaker.oscog-eem.232 (e)"
#endif
;
static void * sCOAFfn;
@@ -84,10 +126,10 @@
static AsyncFile *
asyncFileValueOf(sqInt oop)
{
- interpreterProxy->success((!(interpreterProxy->isIntegerObject(oop)))
- && ((interpreterProxy->isBytes(oop))
- && ((interpreterProxy->slotSizeOf(oop)) == (sizeof(AsyncFile)))));
- if (interpreterProxy->failed()) {
+ success((!(isIntegerObject(oop)))
+ && ((isBytes(oop))
+ && ((slotSizeOf(oop)) == (sizeof(AsyncFile)))));
+ if (failed()) {
return null;
}
return (AsyncFile *) (oop + 4);
@@ -127,7 +169,7 @@
EXPORT(sqInt)
initialiseModule(void)
{
- sCOAFfn = interpreterProxy->ioLoadFunctionFrom("secCanOpenAsyncFileOfSizeWritable", "SecurityPlugin");
+ sCOAFfn = ioLoadFunctionFrom("secCanOpenAsyncFileOfSizeWritable", "SecurityPlugin");
return asyncFileInit();
}
@@ -159,16 +201,16 @@
AsyncFile *f;
sqInt fh;
- fh = interpreterProxy->stackValue(0);
- if (interpreterProxy->failed()) {
+ fh = stackValue(0);
+ if (failed()) {
return null;
}
f = asyncFileValueOf(fh);
asyncFileClose(f);
- if (interpreterProxy->failed()) {
+ if (failed()) {
return null;
}
- interpreterProxy->pop(1);
+ pop(1);
return null;
}
@@ -183,34 +225,34 @@
sqInt semaIndex;
sqInt writeFlag;
- interpreterProxy->success(interpreterProxy->isBytes(interpreterProxy->stackValue(2)));
- fileName = ((char *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(2))));
- writeFlag = interpreterProxy->booleanValueOf(interpreterProxy->stackValue(1));
- semaIndex = interpreterProxy->stackIntegerValue(0);
- if (interpreterProxy->failed()) {
+ success(isBytes(stackValue(2)));
+ fileName = ((char *) (firstIndexableField(stackValue(2))));
+ writeFlag = booleanValueOf(stackValue(1));
+ semaIndex = stackIntegerValue(0);
+ if (failed()) {
return null;
}
/* If the security plugin can be loaded, use it to check for permission.
If not, assume it's ok */
- fileNameSize = interpreterProxy->slotSizeOf(((int) fileName) - 4);
+ fileNameSize = slotSizeOf(((int) fileName) - 4);
if (sCOAFfn != 0) {
okToOpen = ((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag);
if (!okToOpen) {
- interpreterProxy->primitiveFail();
+ primitiveFail();
return null;
}
}
- fOop = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), sizeof(AsyncFile));
+ fOop = instantiateClassindexableSize(classByteArray(), sizeof(AsyncFile));
f = asyncFileValueOf(fOop);
- if (!(interpreterProxy->failed())) {
+ if (!(failed())) {
asyncFileOpen(f, (int)fileName, fileNameSize, writeFlag, semaIndex);
}
- if (interpreterProxy->failed()) {
+ if (failed()) {
return null;
}
- interpreterProxy->popthenPush(4, fOop);
+ popthenPush(4, fOop);
return null;
}
@@ -229,11 +271,11 @@
sqInt startIndex;
sqInt _return_value;
- fhandle = interpreterProxy->stackValue(3);
- buffer = interpreterProxy->stackValue(2);
- start = interpreterProxy->stackIntegerValue(1);
- num = interpreterProxy->stackIntegerValue(0);
- if (interpreterProxy->failed()) {
+ fhandle = stackValue(3);
+ buffer = stackValue(2);
+ start = stackIntegerValue(1);
+ num = stackIntegerValue(0);
+ if (failed()) {
return null;
}
f = asyncFileValueOf(fhandle);
@@ -242,8 +284,8 @@
/* in bytes or words */
- bufferSize = interpreterProxy->slotSizeOf(buffer);
- if (interpreterProxy->isWords(buffer)) {
+ bufferSize = slotSizeOf(buffer);
+ if (isWords(buffer)) {
/* covert word counts to byte counts */
@@ -251,20 +293,20 @@
startIndex = ((startIndex - 1) * 4) + 1;
bufferSize = bufferSize * 4;
}
- interpreterProxy->success((startIndex >= 1)
+ success((startIndex >= 1)
&& (((startIndex + count) - 1) <= bufferSize));
/* adjust for zero-origin indexing */
- bufferPtr = ((((int) (interpreterProxy->firstIndexableField(buffer)))) + startIndex) - 1;
- if (!(interpreterProxy->failed())) {
+ bufferPtr = ((((int) (firstIndexableField(buffer)))) + startIndex) - 1;
+ if (!(failed())) {
r = asyncFileReadResult(f, bufferPtr, count);
}
- _return_value = interpreterProxy->integerObjectOf(r);
- if (interpreterProxy->failed()) {
+ _return_value = integerObjectOf(r);
+ if (failed()) {
return null;
}
- interpreterProxy->popthenPush(5, _return_value);
+ popthenPush(5, _return_value);
return null;
}
@@ -276,18 +318,18 @@
sqInt fHandle;
sqInt fPosition;
- fHandle = interpreterProxy->stackValue(2);
- fPosition = interpreterProxy->stackIntegerValue(1);
- count = interpreterProxy->stackIntegerValue(0);
- if (interpreterProxy->failed()) {
+ fHandle = stackValue(2);
+ fPosition = stackIntegerValue(1);
+ count = stackIntegerValue(0);
+ if (failed()) {
return null;
}
f = asyncFileValueOf(fHandle);
asyncFileReadStart(f, fPosition, count);
- if (interpreterProxy->failed()) {
+ if (failed()) {
return null;
}
- interpreterProxy->pop(3);
+ pop(3);
return null;
}
@@ -299,17 +341,17 @@
sqInt r;
sqInt _return_value;
- fHandle = interpreterProxy->stackValue(0);
- if (interpreterProxy->failed()) {
+ fHandle = stackValue(0);
+ if (failed()) {
return null;
}
f = asyncFileValueOf(fHandle);
r = asyncFileWriteResult(f);
- _return_value = interpreterProxy->integerObjectOf(r);
- if (interpreterProxy->failed()) {
+ _return_value = integerObjectOf(r);
+ if (failed()) {
return null;
}
- interpreterProxy->popthenPush(2, _return_value);
+ popthenPush(2, _return_value);
return null;
}
@@ -327,16 +369,16 @@
sqInt start;
sqInt startIndex;
- fHandle = interpreterProxy->stackValue(4);
- fPosition = interpreterProxy->stackIntegerValue(3);
- buffer = interpreterProxy->stackValue(2);
- start = interpreterProxy->stackIntegerValue(1);
- num = interpreterProxy->stackIntegerValue(0);
- if (interpreterProxy->failed()) {
+ fHandle = stackValue(4);
+ fPosition = stackIntegerValue(3);
+ buffer = stackValue(2);
+ start = stackIntegerValue(1);
+ num = stackIntegerValue(0);
+ if (failed()) {
return null;
}
f = asyncFileValueOf(fHandle);
- if (interpreterProxy->failed()) {
+ if (failed()) {
return null;
}
count = num;
@@ -344,8 +386,8 @@
/* in bytes or words */
- bufferSize = interpreterProxy->slotSizeOf(buffer);
- if (interpreterProxy->isWords(buffer)) {
+ bufferSize = slotSizeOf(buffer);
+ if (isWords(buffer)) {
/* covert word counts to byte counts */
@@ -353,24 +395,24 @@
startIndex = ((startIndex - 1) * 4) + 1;
bufferSize = bufferSize * 4;
}
- interpreterProxy->success((startIndex >= 1)
+ success((startIndex >= 1)
&& (((startIndex + count) - 1) <= bufferSize));
/* adjust for zero-origin indexing */
- bufferPtr = ((((int) (interpreterProxy->firstIndexableField(buffer)))) + startIndex) - 1;
- if (!(interpreterProxy->failed())) {
+ bufferPtr = ((((int) (firstIndexableField(buffer)))) + startIndex) - 1;
+ if (!(failed())) {
asyncFileWriteStart(f, fPosition, bufferPtr, count);
}
- if (interpreterProxy->failed()) {
+ if (failed()) {
return null;
}
- interpreterProxy->pop(5);
+ pop(5);
return null;
}
-/* Note: This is coded so that is can be run from Squeak. */
+/* Note: This is coded so that it can be run in Squeak. */
EXPORT(sqInt)
setInterpreter(struct VirtualMachine*anInterpreter)
@@ -378,11 +420,30 @@
sqInt ok;
interpreterProxy = anInterpreter;
- ok = interpreterProxy->majorVersion() == VM_PROXY_MAJOR;
- if (ok == 0) {
- return 0;
+ ok = ((interpreterProxy->majorVersion()) == (VM_PROXY_MAJOR))
+ && ((interpreterProxy->minorVersion()) >= (VM_PROXY_MINOR));
+ if (ok) {
+
+#if !defined(SQUEAK_BUILTIN_PLUGIN)
+ booleanValueOf = interpreterProxy->booleanValueOf;
+ classByteArray = interpreterProxy->classByteArray;
+ failed = interpreterProxy->failed;
+ firstIndexableField = interpreterProxy->firstIndexableField;
+ instantiateClassindexableSize = interpreterProxy->instantiateClassindexableSize;
+ integerObjectOf = interpreterProxy->integerObjectOf;
+ ioLoadFunctionFrom = interpreterProxy->ioLoadFunctionFrom;
+ isBytes = interpreterProxy->isBytes;
+ isIntegerObject = interpreterProxy->isIntegerObject;
+ isWords = interpreterProxy->isWords;
+ pop = interpreterProxy->pop;
+ popthenPush = interpreterProxy->popthenPush;
+ primitiveFail = interpreterProxy->primitiveFail;
+ slotSizeOf = interpreterProxy->slotSizeOf;
+ stackIntegerValue = interpreterProxy->stackIntegerValue;
+ stackValue = interpreterProxy->stackValue;
+ success = interpreterProxy->success;
+#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */;
}
- ok = interpreterProxy->minorVersion() >= VM_PROXY_MINOR;
return ok;
}
Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-12-04 17:53:23 UTC (rev 2630)
+++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-12-12 02:04:46 UTC (rev 2631)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6
+ VMPluginCodeGenerator VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
from
- BalloonEnginePlugin VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6
+ BalloonEnginePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6 " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.232 uuid: 9ecffa1b-c204-4dbd-b148-79e209e6470a " __DATE__ ;
@@ -12,6 +12,11 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
/* Default EXPORT macro that does nothing (see comment in sq.h): */
#define EXPORT(returnType) returnType
@@ -34,6 +39,7 @@
#endif
#include "sqMemoryAccess.h"
+#include "sqMemoryAccess.h"
/*** Constants ***/
@@ -746,16 +752,98 @@
static sqInt geProfileTime;
static int* getBuffer;
-#ifdef SQUEAK_BUILTIN_PLUGIN
+#if !defined(SQUEAK_BUILTIN_PLUGIN)
+static sqInt (*booleanValueOf)(sqInt obj);
+static sqInt (*byteSizeOf)(sqInt oop);
+static sqInt (*classBitmap)(void);
+static sqInt (*classPoint)(void);
+static sqInt (*failed)(void);
+static sqInt (*fetchClassOf)(sqInt oop);
+static sqInt (*fetchIntegerofObject)(sqInt fieldIndex, sqInt objectPointer);
+static sqInt (*fetchPointerofObject)(sqInt index, sqInt oop);
+static void * (*firstIndexableField)(sqInt oop);
+static double (*floatValueOf)(sqInt oop);
+static sqInt (*integerValueOf)(sqInt oop);
+static void * (*ioLoadFunctionFrom)(char *functionName, char *moduleName);
+static sqInt (*ioMicroMSecs)(void);
+static sqInt (*isArray)(sqInt oop);
+static sqInt (*isBytes)(sqInt oop);
+static sqInt (*isFloatObject)(sqInt oop);
+static sqInt (*isIntegerObject)(sqInt objectPointer);
+static sqInt (*isPointers)(sqInt oop);
+static sqInt (*isWords)(sqInt oop);
+static sqInt (*makePointwithxValueyValue)(sqInt xValue, sqInt yValue);
+static sqInt (*methodArgumentCount)(void);
+static sqInt (*nilObject)(void);
+static sqInt (*pop)(sqInt nItems);
+static sqInt (*popthenPush)(sqInt nItems, sqInt oop);
+static sqInt (*popRemappableOop)(void);
+static sqInt (*positive32BitIntegerFor)(sqInt integerValue);
+static sqInt (*positive32BitValueOf)(sqInt oop);
+static sqInt (*primitiveFail)(void);
+static sqInt (*primitiveFailFor)(sqInt reasonCode);
+static sqInt (*push)(sqInt object);
+static sqInt (*pushBool)(sqInt trueOrFalse);
+static sqInt (*pushInteger)(sqInt integerValue);
+static sqInt (*pushRemappableOop)(sqInt oop);
+static sqInt (*slotSizeOf)(sqInt oop);
+static sqInt (*stackIntegerValue)(sqInt offset);
+static sqInt (*stackObjectValue)(sqInt offset);
+static sqInt (*stackValue)(sqInt offset);
+static sqInt (*storeIntegerofObjectwithValue)(sqInt index, sqInt oop, sqInt integer);
+static sqInt (*storePointerofObjectwithValue)(sqInt index, sqInt oop, sqInt valuePointer);
+static sqInt (*topRemappableOop)(void);
+#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */
+extern sqInt booleanValueOf(sqInt obj);
+extern sqInt byteSizeOf(sqInt oop);
+extern sqInt classBitmap(void);
+extern sqInt classPoint(void);
+extern sqInt failed(void);
+extern sqInt fetchClassOf(sqInt oop);
+extern sqInt fetchIntegerofObject(sqInt fieldIndex, sqInt objectPointer);
+extern sqInt fetchPointerofObject(sqInt index, sqInt oop);
+extern void * firstIndexableField(sqInt oop);
+extern double floatValueOf(sqInt oop);
+extern sqInt integerValueOf(sqInt oop);
+extern void * ioLoadFunctionFrom(char *functionName, char *moduleName);
+extern sqInt ioMicroMSecs(void);
+extern sqInt isArray(sqInt oop);
+extern sqInt isBytes(sqInt oop);
+extern sqInt isFloatObject(sqInt oop);
+extern sqInt isIntegerObject(sqInt objectPointer);
+extern sqInt isPointers(sqInt oop);
+extern sqInt isWords(sqInt oop);
+extern sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue);
+extern sqInt methodArgumentCount(void);
+extern sqInt nilObject(void);
+extern sqInt pop(sqInt nItems);
+extern sqInt popthenPush(sqInt nItems, sqInt oop);
+extern sqInt popRemappableOop(void);
+extern sqInt positive32BitIntegerFor(sqInt integerValue);
+extern sqInt positive32BitValueOf(sqInt oop);
+extern sqInt primitiveFail(void);
+extern sqInt primitiveFailFor(sqInt reasonCode);
+extern sqInt push(sqInt object);
+extern sqInt pushBool(sqInt trueOrFalse);
+extern sqInt pushInteger(sqInt integerValue);
+extern sqInt pushRemappableOop(sqInt oop);
+extern sqInt slotSizeOf(sqInt oop);
+extern sqInt stackIntegerValue(sqInt offset);
+extern sqInt stackObjectValue(sqInt offset);
+extern sqInt stackValue(sqInt offset);
+extern sqInt storeIntegerofObjectwithValue(sqInt index, sqInt oop, sqInt integer);
+extern sqInt storePointerofObjectwithValue(sqInt index, sqInt oop, sqInt valuePointer);
+extern sqInt topRemappableOop(void);
+
extern
#endif
struct VirtualMachine* interpreterProxy;
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin VMMaker.oscog-eem.222 (i)"
+ "B2DPlugin VMMaker.oscog-eem.232 (i)"
#else
- "B2DPlugin VMMaker.oscog-eem.222 (e)"
+ "B2DPlugin VMMaker.oscog-eem.232 (e)"
#endif
;
static int* objBuffer;
@@ -1664,8 +1752,8 @@
sqInt runLength;
sqInt runValue;
- length = interpreterProxy->slotSizeOf(fillList);
- fillPtr = interpreterProxy->firstIndexableField(fillList);
+ length = slotSizeOf(fillList);
+ fillPtr = firstIndexableField(fillList);
nFills = 0;
for (i = 0; i <= (length - 1); i += 1) {
runLength = ((usqInt) ((((int *) fillPtr))[i]) >> 16);
@@ -1693,11 +1781,11 @@
/* First check if the oops have the right format */
- if (!(interpreterProxy->isWords(indexList))) {
+ if (!(isWords(indexList))) {
return 0;
}
- length = interpreterProxy->slotSizeOf(indexList);
- fillPtr = interpreterProxy->firstIndexableField(indexList);
+ length = slotSizeOf(indexList);
+ fillPtr = firstIndexableField(indexList);
for (i = 0; i <= (length - 1); i += 1) {
/* Make sure the fill is okay */
@@ -1722,8 +1810,8 @@
int *ptr;
sqInt runLength;
- length = interpreterProxy->slotSizeOf(lineWidthList);
- ptr = interpreterProxy->firstIndexableField(lineWidthList);
+ length = slotSizeOf(lineWidthList);
+ ptr = firstIndexableField(lineWidthList);
nItems = 0;
for (i = 0; i <= (length - 1); i += 1) {
runLength = ((usqInt) ((((int *) ptr))[i]) >> 16);
@@ -1740,7 +1828,7 @@
{
sqInt pSize;
- if (!(interpreterProxy->isWords(points))) {
+ if (!(isWords(points))) {
return 0;
}
@@ -1749,7 +1837,7 @@
pSize = nSegments * 3, for ShortPointArrays or,
pSize = nSegments * 6, for PointArrays */
- pSize = interpreterProxy->slotSizeOf(points);
+ pSize = slotSizeOf(points);
if (!((pSize == (nSegments * 3))
|| (pSize == (nSegments * 6)))) {
return 0;
@@ -1772,7 +1860,7 @@
if (!(checkCompressedFills(fillIndexList))) {
return 0;
}
- maxFillIndex = interpreterProxy->slotSizeOf(fillIndexList);
+ maxFillIndex = slotSizeOf(fillIndexList);
if (!(checkCompressedFillIndexListmaxsegments(leftFills, maxFillIndex, nSegments))) {
return 0;
}
@@ -5272,8 +5360,8 @@
EXPORT(sqInt)
initialiseModule(void)
{
- loadBBFn = interpreterProxy->ioLoadFunctionFrom("loadBitBltFrom", bbPluginName);
- copyBitsFn = interpreterProxy->ioLoadFunctionFrom("copyBitsFromtoat", bbPluginName);
+ loadBBFn = ioLoadFunctionFrom("loadBitBltFrom", bbPluginName);
+ copyBitsFn = ioLoadFunctionFrom("copyBitsFromtoat", bbPluginName);
return (loadBBFn != 0)
&& (copyBitsFn != 0);
}
@@ -5685,15 +5773,15 @@
sqInt y3;
sqInt y4;
- loadPointfrom(point1Get(), interpreterProxy->fetchPointerofObject(0, points));
- if (interpreterProxy->failed()) {
+ loadPointfrom(point1Get(), fetchPointerofObject(0, points));
+ if (failed()) {
return null;
}
x0 = (point1Get())[0];
y0 = (point1Get())[1];
for (i = 1; i <= (nPoints - 1); i += 1) {
- loadPointfrom(point1Get(), interpreterProxy->fetchPointerofObject(i, points));
- if (interpreterProxy->failed()) {
+ loadPointfrom(point1Get(), fetchPointerofObject(i, points));
+ if (failed()) {
return null;
}
x1 = (point1Get())[0];
@@ -5842,13 +5930,13 @@
sqInt y5;
for (i = 0; i <= (nSegments - 1); i += 1) {
- pointOop = interpreterProxy->fetchPointerofObject(i * 3, points);
+ pointOop = fetchPointerofObject(i * 3, points);
loadPointfrom(point1Get(), pointOop);
- pointOop = interpreterProxy->fetchPointerofObject((i * 3) + 1, points);
+ pointOop = fetchPointerofObject((i * 3) + 1, points);
loadPointfrom(point2Get(), pointOop);
- pointOop = interpreterProxy->fetchPointerofObject((i * 3) + 2, points);
+ pointOop = fetchPointerofObject((i * 3) + 2, points);
loadPointfrom(point3Get(), pointOop);
- if (interpreterProxy->failed()) {
+ if (failed()) {
return null;
}
/* begin transformPoints: */
@@ -5994,16 +6082,16 @@
sqInt value;
for (i = 0; i <= (n - 1); i += 1) {
- value = interpreterProxy->fetchPointerofObject(i, transformOop);
- if (!((interpreterProxy->isIntegerObject(value))
- || (interpreterProxy->isFloatObject(value)))) {
- return interpreterProxy->primitiveFail();
+ value = fetchPointerofObject(i, transformOop);
+ if (!((isIntegerObject(value))
+ || (isFloatObject(value)))) {
+ return primitiveFail();
}
- if (interpreterProxy->isIntegerObject(value)) {
- destPtr[i] = (((float) (((double) (interpreterProxy->integerValueOf(value)) ))));
+ if (isIntegerObject(value)) {
+ destPtr[i] = (((float) (((double) (integerValueOf(value)) ))));
}
else {
- destPtr[i] = (((float) (interpreterProxy->floatValueOf(value))));
+ destPtr[i] = (((float) (floatValueOf(value))));
}
}
}
@@ -6073,52 +6161,52 @@
sqInt i;
sqInt ppw;
- if (cmOop == (interpreterProxy->nilObject())) {
+ if (cmOop == (nilObject())) {
cmSize = 0;
cmBits = null;
}
else {
- if (!((interpreterProxy->fetchClassOf(cmOop)) == (interpreterProxy->classBitmap()))) {
- return interpreterProxy->primitiveFail();
+ if (!((fetchClassOf(cmOop)) == (classBitmap()))) {
+ return primitiveFail();
}
- cmSize = interpreterProxy->slotSizeOf(cmOop);
- cmBits = interpreterProxy->firstIndexableField(cmOop);
+ cmSize = slotSizeOf(cmOop);
+ cmBits = firstIndexableField(cmOop);
}
- if (interpreterProxy->isIntegerObject(formOop)) {
- return interpreterProxy->primitiveFail();
+ if (isIntegerObject(formOop)) {
+ return primitiveFail();
}
- if (!(interpreterProxy->isPointers(formOop))) {
- return interpreterProxy->primitiveFail();
+ if (!(isPointers(formOop))) {
+ return primitiveFail();
}
- if ((interpreterProxy->slotSizeOf(formOop)) < 5) {
- return interpreterProxy->primitiveFail();
+ if ((slotSizeOf(formOop)) < 5) {
+ return primitiveFail();
}
- bmBits = interpreterProxy->fetchPointerofObject(0, formOop);
- if (!((interpreterProxy->fetchClassOf(bmBits)) == (interpreterProxy->classBitmap()))) {
- return interpreterProxy->primitiveFail();
+ bmBits = fetchPointerofObject(0, formOop);
+ if (!((fetchClassOf(bmBits)) == (classBitmap()))) {
+ return primitiveFail();
}
- bmBitsSize = interpreterProxy->slotSizeOf(bmBits);
- bmWidth = interpreterProxy->fetchIntegerofObject(1, formOop);
- bmHeight = interpreterProxy->fetchIntegerofObject(2, formOop);
- bmDepth = interpreterProxy->fetchIntegerofObject(3, formOop);
- if (interpreterProxy->failed()) {
+ bmBitsSize = slotSizeOf(bmBits);
+ bmWidth = fetchIntegerofObject(1, formOop);
+ bmHeight = fetchIntegerofObject(2, formOop);
+ bmDepth = fetchIntegerofObject(3, formOop);
+ if (failed()) {
return null;
}
if (!((bmWidth >= 0)
&& (bmHeight >= 0))) {
- return interpreterProxy->primitiveFail();
+ return primitiveFail();
}
if (!((((((bmDepth == 32) || (bmDepth == 8)) || (bmDepth == 16)) || (bmDepth == 1)) || (bmDepth == 2)) || (bmDepth == 4))) {
- return interpreterProxy->primitiveFail();
+ return primitiveFail();
}
if (!((cmSize == 0)
|| (cmSize == (1 << bmDepth)))) {
- return interpreterProxy->primitiveFail();
+ return primitiveFail();
}
ppw = 32 / bmDepth;
bmRaster = (bmWidth + (ppw - 1)) / ppw;
if (!(bmBitsSize == (bmRaster * bmHeight))) {
- return interpreterProxy->primitiveFail();
+ return primitiveFail();
}
/* begin allocateBitmapFill:colormap: */
fillSize = GBMBaseSize + cmSize;
@@ -6172,16 +6260,16 @@
sqInt xIndex;
xIndex = objBuffer[bmFill + GEObjectIndex];
- if (xIndex > (interpreterProxy->slotSizeOf(formArray))) {
+ if (xIndex > (slotSizeOf(formArray))) {
return null;
}
- formOop = interpreterProxy->fetchPointerofObject(xIndex, formArray);
- bitsOop = interpreterProxy->fetchPointerofObject(0, formOop);
- bitsLen = interpreterProxy->slotSizeOf(bitsOop);
+ formOop = fetchPointerofObject(xIndex, formArray);
+ bitsOop = fetchPointerofObject(0, formOop);
+ bitsLen = slotSizeOf(bitsOop);
if (!(bitsLen == (objBuffer[bmFill + GBBitmapSize]))) {
return null;
}
- return interpreterProxy->firstIndexableField(bitsOop);
+ return firstIndexableField(bitsOop);
}
@@ -6922,20 +7010,20 @@
sqInt value3;
edge = workBuffer[GWLastExportedEdge];
- if ((interpreterProxy->slotSizeOf(edgeOop)) < ETBalloonEdgeDataSize) {
+ if ((slotSizeOf(edgeOop)) < ETBalloonEdgeDataSize) {
return null;
}
/* begin edgeXValueOf:put: */
- value = interpreterProxy->fetchIntegerofObject(ETXValueIndex, edgeOop);
+ value = fetchIntegerofObject(ETXValueIndex, edgeOop);
objBuffer[edge + GEXValue] = value;
/* begin edgeYValueOf:put: */
- value1 = interpreterProxy->fetchIntegerofObject(ETYValueIndex, edgeOop);
+ value1 = fetchIntegerofObject(ETYValueIndex, edgeOop);
objBuffer[edge + GEYValue] = value1;
/* begin edgeZValueOf:put: */
- value2 = interpreterProxy->fetchIntegerofObject(ETZValueIndex, edgeOop);
+ value2 = fetchIntegerofObject(ETZValueIndex, edgeOop);
objBuffer[edge + GEZValue] = value2;
/* begin edgeNumLinesOf:put: */
- value3 = interpreterProxy->fetchIntegerofObject(ETLinesIndex, edgeOop);
+ value3 = fetchIntegerofObject(ETLinesIndex, edgeOop);
objBuffer[edge + GENumLines] = value3;
return edge;
}
@@ -6954,7 +7042,7 @@
/* begin edgeTransform */
transform = ((float *) (workBuffer + GWEdgeTransform));
okay = loadTransformFromintolength(transformOop, transform, 6);
- if (interpreterProxy->failed()) {
+ if (failed()) {
return null;
}
if (!okay) {
@@ -7108,30 +7196,30 @@
sqInt i;
sqInt ppw;
- if (!(interpreterProxy->isArray(arrayOop))) {
+ if (!(isArray(arrayOop))) {
return 0;
}
formArray = arrayOop;
- for (i = 0; i <= ((interpreterProxy->slotSizeOf(formArray)) - 1); i += 1) {
- formOop = interpreterProxy->fetchPointerofObject(i, formArray);
- if (interpreterProxy->isIntegerObject(formOop)) {
+ for (i = 0; i <= ((slotSizeOf(formArray)) - 1); i += 1) {
+ formOop = fetchPointerofObject(i, formArray);
+ if (isIntegerObject(formOop)) {
return 0;
}
- if (!(interpreterProxy->isPointers(formOop))) {
+ if (!(isPointers(formOop))) {
return 0;
}
- if ((interpreterProxy->slotSizeOf(formOop)) < 5) {
+ if ((slotSizeOf(formOop)) < 5) {
return 0;
}
- bmBits = interpreterProxy->fetchPointerofObject(0, formOop);
- if (!((interpreterProxy->fetchClassOf(bmBits)) == (interpreterProxy->classBitmap()))) {
+ bmBits = fetchPointerofObject(0, formOop);
+ if (!((fetchClassOf(bmBits)) == (classBitmap()))) {
return 0;
}
- bmBitsSize = interpreterProxy->slotSizeOf(bmBits);
- bmWidth = interpreterProxy->fetchIntegerofObject(1, formOop);
- bmHeight = interpreterProxy->fetchIntegerofObject(2, formOop);
- bmDepth = interpreterProxy->fetchIntegerofObject(3, formOop);
- if (interpreterProxy->failed()) {
+ bmBitsSize = slotSizeOf(bmBits);
+ bmWidth = fetchIntegerofObject(1, formOop);
+ bmHeight = fetchIntegerofObject(2, formOop);
+ bmDepth = fetchIntegerofObject(3, formOop);
+ if (failed()) {
return 0;
}
if (!((bmWidth >= 0)
@@ -7161,12 +7249,12 @@
int *rampPtr;
sqInt rampWidth;
- if (!((interpreterProxy->fetchClassOf(rampOop)) == (interpreterProxy->classBitmap()))) {
- return interpreterProxy->primitiveFail();
+ if (!((fetchClassOf(rampOop)) == (classBitmap()))) {
+ return primitiveFail();
}
- rampWidth = interpreterProxy->slotSizeOf(rampOop);
+ rampWidth = slotSizeOf(rampOop);
/* begin allocateGradientFill:rampWidth:isRadial: */
- ramp = interpreterProxy->firstIndexableField(rampOop);
+ ramp = firstIndexableField(rampOop);
fillSize = GGBaseSize + rampWidth;
if (!(allocateObjEntry(fillSize))) {
fill = 0;
@@ -7441,30 +7529,30 @@
{
sqInt value;
- if (!((interpreterProxy->fetchClassOf(pointOop)) == (interpreterProxy->classPoint()))) {
- return interpreterProxy->primitiveFail();
+ if (!((fetchClassOf(pointOop)) == (classPoint()))) {
+ return primitiveFail();
}
- value = interpreterProxy->fetchPointerofObject(0, pointOop);
- if (!((interpreterProxy->isIntegerObject(value))
- || (interpreterProxy->isFloatObject(value)))) {
- return interpreterProxy->primitiveFail();
+ value = fetchPointerofObject(0, pointOop);
+ if (!((isIntegerObject(value))
+ || (isFloatObject(value)))) {
+ return primitiveFail();
}
- if (interpreterProxy->isIntegerObject(value)) {
- pointArray[0] = (interpreterProxy->integerValueOf(value));
+ if (isIntegerObject(value)) {
+ pointArray[0] = (integerValueOf(value));
}
else {
- pointArray[0] = (((sqInt)(interpreterProxy->floatValueOf(value))));
+ pointArray[0] = (((sqInt)(floatValueOf(value))));
}
- value = interpreterProxy->fetchPointerofObject(1, pointOop);
- if (!((interpreterProxy->isIntegerObject(value))
- || (interpreterProxy->isFloatObject(value)))) {
- return interpreterProxy->primitiveFail();
+ value = fetchPointerofObject(1, pointOop);
+ if (!((isIntegerObject(value))
+ || (isFloatObject(value)))) {
+ return primitiveFail();
}
- if (interpreterProxy->isIntegerObject(value)) {
- pointArray[1] = (interpreterProxy->integerValueOf(value));
+ if (isIntegerObject(value)) {
+ pointArray[1] = (integerValueOf(value));
}
else {
- pointArray[1] = (((sqInt)(interpreterProxy->floatValueOf(value))));
+ pointArray[1] = (((sqInt)(floatValueOf(value))));
}
}
@@ -7652,30 +7740,30 @@
sqInt fillOop;
sqInt state;
- if (!((interpreterProxy->methodArgumentCount()) == 2)) {
+ if (!((methodArgumentCount()) == 2)) {
return PrimErrBadNumArgs;
}
- if (((failCode = quickLoadEngineFrom(interpreterProxy->stackValue(2)))) != 0) {
+ if (((failCode = quickLoadEngineFrom(stackValue(2)))) != 0) {
return failCode;
}
- fillOop = interpreterProxy->stackObjectValue(0);
- edgeOop = interpreterProxy->stackObjectValue(1);
- if (interpreterProxy->failed()) {
+ fillOop = stackObjectValue(0);
+ edgeOop = stackObjectValue(1);
+ if (failed()) {
return PrimErrBadArgument;
}
- if (!(((failCode = loadSpanBufferFrom(interpreterProxy->fetchPointerofObject(BESpanIndex, engine)))) == 0)) {
+ if (!(((failCode = loadSpanBufferFrom(fetchPointerofObject(BESpanIndex, engine)))) == 0)) {
return failCode;
}
- if (!(loadBitBltFrom(interpreterProxy->fetchPointerofObject(BEBitBltIndex, engine)))) {
+ if (!(loadBitBltFrom(fetchPointerofObject(BEBitBltIndex, engine)))) {
return GEFBitBltLoadFailed;
}
- if (!(loadFormsFrom(interpreterProxy->fetchPointerofObject(BEFormsIndex, engine)))) {
+ if (!(loadFormsFrom(fetchPointerofObject(BEFormsIndex, engine)))) {
return GEFFormLoadFailed;
}
- if ((interpreterProxy->slotSizeOf(edgeOop)) < ETBalloonEdgeDataSize) {
+ if ((slotSizeOf(edgeOop)) < ETBalloonEdgeDataSize) {
return GEFEdgeDataTooSmall;
}
- if ((interpreterProxy->slotSizeOf(fillOop)) < FTBalloonFillDataSize) {
+ if ((slotSizeOf(fillOop)) < FTBalloonFillDataSize) {
return GEFFillDataTooSmall;
}
state = workBuffer[GWState];
@@ -8019,15 +8107,15 @@
{
sqInt value;
- if (!((interpreterProxy->fetchClassOf(spanOop)) == (interpreterProxy->classBitmap()))) {
+ if (!((fetchClassOf(spanOop)) == (classBitmap()))) {
return GEFClassMismatch;
}
/* Leave last entry unused to avoid complications */
- spanBuffer = interpreterProxy->firstIndexableField(spanOop);
+ spanBuffer = firstIndexableField(spanOop);
/* begin spanSizePut: */
- value = (interpreterProxy->slotSizeOf(spanOop)) - 1;
+ value = (slotSizeOf(spanOop)) - 1;
workBuffer[GWSpanSize] = value;
return 0;
}
@@ -8040,16 +8128,16 @@
static sqInt
loadTransformFromintolength(sqInt transformOop, float *destPtr, sqInt n)
{
- if (transformOop == (interpreterProxy->nilObject())) {
+ if (transformOop == (nilObject())) {
return 0;
}
- if (interpreterProxy->isIntegerObject(transformOop)) {
- return interpreterProxy->primitiveFail();
+ if (isIntegerObject(transformOop)) {
+ return primitiveFail();
}
- if (!((interpreterProxy->slotSizeOf(transformOop)) == n)) {
- return interpreterProxy->primitiveFail();
+ if (!((slotSizeOf(transformOop)) == n)) {
+ return primitiveFail();
}
- if (interpreterProxy->isWords(transformOop)) {
+ if (isWords(transformOop)) {
loadWordTransformFromintolength(transformOop, destPtr, n);
}
else {
@@ -8210,7 +8298,7 @@
sqInt i;
float *srcPtr;
- srcPtr = ((float *) (interpreterProxy->firstIndexableField(transformOop)));
+ srcPtr = ((float *) (firstIndexableField(transformOop)));
for (i = 0; i <= (n - 1); i += 1) {
destPtr[i] = (srcPtr[i]);
}
@@ -8222,21 +8310,21 @@
static sqInt
loadWorkBufferFrom(sqInt wbOop)
{
- if (interpreterProxy->isIntegerObject(wbOop)) {
+ if (isIntegerObject(wbOop)) {
return GEFWorkBufferIsInteger;
}
- if (!(interpreterProxy->isWords(wbOop))) {
+ if (!(isWords(wbOop))) {
return GEFWorkBufferIsPointers;
}
- if ((interpreterProxy->slotSizeOf(wbOop)) < GWMinimalSize) {
+ if ((slotSizeOf(wbOop)) < GWMinimalSize) {
return GEFWorkBufferTooSmall;
}
/* begin workBufferPut: */
- workBuffer = interpreterProxy->firstIndexableField(wbOop);
+ workBuffer = firstIndexableField(wbOop);
if (!((workBuffer[GWMagicIndex]) == GWMagicNumber)) {
return GEFWorkBufferBadMagic;
}
- if (!((workBuffer[GWSize]) == (interpreterProxy->slotSizeOf(wbOop)))) {
+ if (!((workBuffer[GWSize]) == (slotSizeOf(wbOop)))) {
return GEFWorkBufferWrongSize;
}
if (!((workBuffer[GWObjStart]) == GWHeaderSize)) {
@@ -8499,11 +8587,11 @@
{
sqInt failureCode;
- if (!((interpreterProxy->methodArgumentCount()) == 0)) {
- return interpreterProxy->primitiveFailFor(PrimErrBadNumArgs);
+ if (!((methodArgumentCount()) == 0)) {
+ return primitiveFailFor(PrimErrBadNumArgs);
}
- if (!(((failureCode = quickLoadEngineFrom(interpreterProxy->stackValue(0)))) == 0)) {
- return interpreterProxy->primitiveFailFor(failureCode);
+ if (!(((failureCode = quickLoadEngineFrom(stackValue(0)))) == 0)) {
+ return primitiveFailFor(failureCode);
}
workBuffer[GWState] = GEStateCompleted;
/* begin storeEngineStateInto: */
@@ -8522,39 +8610,39 @@
sqInt value;
if (doProfileStats) {
- geProfileTime = interpreterProxy->ioMicroMSecs();
+ geProfileTime = ioMicroMSecs();
}
- if (!((interpreterProxy->methodArgumentCount()) == 1)) {
- return interpreterProxy->primitiveFailFor(PrimErrBadNumArgs);
+ if (!((methodArgumentCount()) == 1)) {
+ return primitiveFailFor(PrimErrBadNumArgs);
}
- if (!(((failureCode = quickLoadEngineFromrequiredState(interpreterProxy->stackValue(1), GEStateWaitingForEdge))) == 0)) {
- return interpreterProxy->primitiveFailFor(failureCode);
+ if (!(((failureCode = quickLoadEngineFromrequiredState(stackValue(1), GEStateWaitingForEdge))) == 0)) {
+ return primitiveFailFor(failureCode);
}
- edgeOop = interpreterProxy->stackObjectValue(0);
- if (interpreterProxy->failed()) {
- return interpreterProxy->primitiveFailFor(PrimErrBadArgument);
+ edgeOop = stackObjectValue(0);
+ if (failed()) {
+ return primitiveFailFor(PrimErrBadArgument);
}
edge = loadEdgeStateFrom(edgeOop);
if (edge == null) {
- return interpreterProxy->primitiveFailFor(GEFEdgeDataTooSmall);
+ return primitiveFailFor(GEFEdgeDataTooSmall);
}
if (!(needAvailableSpace(1))) {
- return interpreterProxy->primitiveFailFor(GEFWorkTooBig);
+ return primitiveFailFor(GEFWorkTooBig);
}
if ((objBuffer[edge + GENumLines]) > 0) {
insertEdgeIntoAET(edge);
}
if (engineStopped) {
- return interpreterProxy->primitiveFailFor(GEFEngineStopped);
+ return primitiveFailFor(GEFEngineStopped);
}
workBuffer[GWState] = GEStateAddingFromGET;
/* begin storeEngineStateInto: */
workBuffer[GWObjUsed] = objUsed;
- interpreterProxy->pop(1);
+ pop(1);
if (doProfileStats) {
workBuffer[GWCountAddAETEntry] = ((workBuffer[GWCountAddAETEntry]) + 1);
/* begin incrementStat:by: */
- value = (interpreterProxy->ioMicroMSecs()) - geProfileTime;
+ value = (ioMicroMSecs()) - geProfileTime;
workBuffer[GWTimeAddAETEntry] = ((workBuffer[GWTimeAddAETEntry]) + value);
}
}
@@ -8589,32 +8677,32 @@
/* Fail if we have the wrong number of arguments */
- if (!((interpreterProxy->methodArgumentCount()) == 5)) {
- return interpreterProxy->primitiveFailFor(PrimErrBadNumArgs);
+ if (!((methodArgumentCount()) == 5)) {
+ return primitiveFailFor(PrimErrBadNumArgs);
}
- rightFill = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(0));
- leftFill = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(1));
- viaOop = interpreterProxy->stackObjectValue(2);
- endOop = interpreterProxy->stackObjectValue(3);
- startOop = interpreterProxy->stackObjectValue(4);
- if (interpreterProxy->failed()) {
- return interpreterProxy->primitiveFailFor(PrimErrBadArgument);
+ rightFill = positive32BitValueOf(stackValue(0));
+ leftFill = positive32BitValueOf(stackValue(1));
+ viaOop = stackObjectValue(2);
+ endOop = stackObjectValue(3);
+ startOop = stackObjectValue(4);
+ if (failed()) {
+ return primitiveFailFor(PrimErrBadArgument);
}
- if (!(((failureCode = quickLoadEngineFromrequiredState(interpreterProxy->stackValue(5), GEStateUnlocked))) == 0)) {
- return interpreterProxy->primitiveFailFor(failureCode);
+ if (!(((failureCode = quickLoadEngineFromrequiredState(stackValue(5), GEStateUnlocked))) == 0)) {
+ return primitiveFailFor(failureCode);
}
if (!((isFillOkay(leftFill))
&& (isFillOkay(rightFill)))) {
- return interpreterProxy->primitiveFailFor(GEFWrongFill);
+ return primitiveFailFor(GEFWrongFill);
}
if ((leftFill == rightFill) && 0) {
- return interpreterProxy->pop(6);
+ return pop(6);
}
loadPointfrom(point1Get(), startOop);
loadPointfrom(point2Get(), viaOop);
loadPointfrom(point3Get(), endOop);
- if (interpreterProxy->failed()) {
- return interpreterProxy->primitiveFailFor(PrimErrBadArgument);
+ if (failed()) {
+ return primitiveFailFor(PrimErrBadArgument);
}
/* begin transformPoints: */
if (3 > 0) {
@@ -8741,14 +8829,14 @@
/* begin wbStackClear */
workBuffer[GWBufferTop] = (workBuffer[GWSize]);
- return interpreterProxy->primitiveFailFor(GEFEngineStopped);
+ return primitiveFailFor(GEFEngineStopped);
}
- if (interpreterProxy->failed()) {
- return interpreterProxy->primitiveFailFor(GEFEntityLoadFailed);
+ if (failed()) {
+ return primitiveFailFor(GEFEntityLoadFailed);
}
/* begin storeEngineStateInto: */
workBuffer[GWObjUsed] = objUsed;
- interpreterProxy->pop(5);
+ pop(5);
}
EXPORT(sqInt)
@@ -8756,53 +8844,53 @@
{
sqInt failureCode;
sqInt fillIndex;
- sqInt isArray;
sqInt length;
sqInt lineFill;
sqInt lineWidth;
sqInt nSegments;
sqInt points;
+ sqInt pointsIsArray;
sqInt segSize;
/* Fail if we have the wrong number of arguments */
- if (!((interpreterProxy->methodArgumentCount()) == 5)) {
- return interpreterProxy->primitiveFailFor(PrimErrBadNumArgs);
+ if (!((methodArgumentCount()) == 5)) {
+ return primitiveFailFor(PrimErrBadNumArgs);
}
- lineFill = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(0));
- lineWidth = interpreterProxy->stackIntegerValue(1);
- fillIndex = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(2));
- nSegments = interpreterProxy->stackIntegerValue(3);
- points = interpreterProxy->stackObjectValue(4);
- if (interpreterProxy->failed()) {
- return interpreterProxy->primitiveFailFor(PrimErrBadArgument);
+ lineFill = positive32BitValueOf(stackValue(0));
+ lineWidth = stackIntegerValue(1);
+ fillIndex = positive32BitValueOf(stackValue(2));
+ nSegments = stackIntegerValue(3);
+ points = stackObjectValue(4);
+ if (failed()) {
+ return primitiveFailFor(PrimErrBadArgument);
}
- if (!(((failureCode = quickLoadEngineFromrequiredState(interpreterProxy->stackValue(5), GEStateUnlocked))) == 0)) {
- return interpreterProxy->primitiveFailFor(failureCode);
+ if (!(((failureCode = quickLoadEngineFromrequiredState(stackValue(5), GEStateUnlocked))) == 0)) {
+ return primitiveFailFor(failureCode);
}
- length = interpreterProxy->slotSizeOf(points);
- if (interpreterProxy->isWords(points)) {
+ length = slotSizeOf(points);
+ if (isWords(points)) {
/* Either PointArray or ShortPointArray */
- isArray = 0;
+ pointsIsArray = 0;
if (!((length == (nSegments * 3))
|| (length == (nSegments * 6)))) {
- return interpreterProxy->primitiveFailFor(PrimErrBadArgument);
+ return primitiveFailFor(PrimErrBadArgument);
}
}
else {
/* Must be Array of points */
- if (!(interpreterProxy->isArray(points))) {
- return interpreterProxy->primitiveFailFor(PrimErrBadArgument);
+ if (!(isArray(points))) {
+ return primitiveFailFor(PrimErrBadArgument);
}
if (!(length == (nSegments * 3))) {
- return interpreterProxy->primitiveFailFor(PrimErrBadArgument);
+ return primitiveFailFor(PrimErrBadArgument);
}
- isArray = 1;
+ pointsIsArray = 1;
}
if ((lineWidth == 0)
|| (lineFill == 0)) {
@@ -8812,21 +8900,21 @@
segSize = GLWideSize;
}
if (!(needAvailableSpace(segSize * nSegments))) {
- return interpreterProxy->primitiveFailFor(GEFWorkTooBig);
+ return primitiveFailFor(GEFWorkTooBig);
}
if (!((isFillOkay(lineFill))
&& (isFillOkay(fillIndex)))) {
- return interpreterProxy->primitiveFailFor(GEFWrongFill);
+ return primitiveFailFor(GEFWrongFill);
}
lineFill = transformColor(lineFill);
fillIndex = transformColor(fillIndex);
if (engineStopped) {
- return interpreterProxy->primitiveFailFor(GEFEngineStopped);
+ return primitiveFailFor(GEFEngineStopped);
}
if (((lineFill == 0)
|| (lineWidth == 0))
&& (fillIndex == 0)) {
- return interpreterProxy->pop(5);
+ return pop(5);
}
if (!(lineWidth == 0)) {
lineWidth = transformWidth(lineWidth);
@@ -8834,22 +8922,22 @@
lineWidth = 1;
}
}
- if (isArray) {
+ if (pointsIsArray) {
loadArrayShapenSegmentsfilllineWidthlineFill(points, nSegments, fillIndex, lineWidth, lineFill);
}
else {
- loadShapenSegmentsfilllineWidthlineFillpointsShort(interpreterProxy->firstIndexableField(points), nSegments, fillIndex, lineWidth, lineFill, (nSegments * 3) == length);
+ loadShapenSegmentsfilllineWidthlineFillpointsShort(firstIndexableField(points), nSegments, fillIndex, lineWidth, lineFill, (nSegments * 3) == length);
}
if (engineStopped) {
- return interpreterProxy->primitiveFailFor(GEFEngineStopped);
+ return primitiveFailFor(GEFEngineStopped);
}
- if (interpreterProxy->failed()) {
- return interpreterProxy->primitiveFailFor(GEFEntityLoadFailed);
+ if (failed()) {
+ return primitiveFailFor(GEFEntityLoadFailed);
}
workBuffer[GWNeedsFlush] = 1;
/* begin storeEngineStateInto: */
workBuffer[GWObjUsed] = objUsed;
- interpreterProxy->pop(5);
+ pop(5);
}
EXPORT(sqInt)
@@ -8886,30 +8974,30 @@
/* Fail if we have the wrong number of arguments */
- if (!((interpreterProxy->methodArgumentCount()) == 7)) {
- return interpreterProxy->primitiveFailFor(PrimErrBadNumArgs);
+ if (!((methodArgumentCount()) == 7)) {
+ return primitiveFailFor(PrimErrBadNumArgs);
}
- xIndex = interpreterProxy->stackIntegerValue(0);
+ xIndex = stackIntegerValue(0);
if (xIndex <= 0) {
- return interpreterProxy->primitiveFailFor(PrimErrBadArgument);
+ return primitiveFailFor(PrimErrBadArgument);
}
- nrmOop = interpreterProxy->stackObjectValue(1);
- dirOop = interpreterProxy->stackObjectValue(2);
- originOop = interpreterProxy->stackObjectValue(3);
- tileFlag = interpreterProxy->booleanValueOf(interpreterProxy->stackValue(4));
- cmOop = interpreterProxy->stackObjectValue(5);
- formOop = interpreterProxy->stackObjectValue(6);
- if (interpreterProxy->failed()) {
- return interpreterProxy->primitiveFailFor(PrimErrBadArgument);
+ nrmOop = stackObjectValue(1);
+ dirOop = stackObjectValue(2);
+ originOop = stackObjectValue(3);
+ tileFlag = booleanValueOf(stackValue(4));
+ cmOop = stackObjectValue(5);
+ formOop = stackObjectValue(6);
+ if (failed()) {
+ return primitiveFailFor(PrimErrBadArgument);
}
- if (!(((failureCode = quickLoadEngineFromrequiredState(interpreterProxy->stackValue(7), GEStateUnlocked))) == 0)) {
- return interpreterProxy->primitiveFailFor(failureCode);
+ if (!(((failureCode = quickLoadEngineFromrequiredState(stackValue(7), GEStateUnlocked))) == 0)) {
+ return primitiveFailFor(failureCode);
}
loadPointfrom(point1Get(), originOop);
loadPointfrom(point2Get(), dirOop);
loadPointfrom(point3Get(), nrmOop);
- if (interpreterProxy->failed()) {
- return interpreterProxy->primitiveFailFor(GEFBadPoint);
+ if (failed()) {
+ return primitiveFailFor(GEFBadPoint);
}
/* begin loadBitmapFill:colormap:tile:from:along:normal:xIndex: */
tileFlag1 = (tileFlag
@@ -8921,61 +9009,61 @@
point2 = ((int *) (workBuffer + GWPoint2));
/* begin point3Get */
point3 = ((int *) (workBuffer + GWPoint3));
- if (cmOop == (interpreterProxy->nilObject())) {
+ if (cmOop == (nilObject())) {
cmSize = 0;
cmBits = null;
}
else {
- if (!((interpreterProxy->fetchClassOf(cmOop)) == (interpreterProxy->classBitmap()))) {
- fill = interpreterProxy->primitiveFail();
+ if (!((fetchClassOf(cmOop)) == (classBitmap()))) {
+ fill = primitiveFail();
goto l1;
}
- cmSize = interpreterProxy->slotSizeOf(cmOop);
- cmBits = interpreterProxy->firstIndexableField(cmOop);
+ cmSize = slotSizeOf(cmOop);
+ cmBits = firstIndexableField(cmOop);
}
- if (interpreterProxy->isIntegerObject(formOop)) {
- fill = interpreterProxy->primitiveFail();
+ if (isIntegerObject(formOop)) {
+ fill = primitiveFail();
goto l1;
}
- if (!(interpreterProxy->isPointers(formOop))) {
- fill = interpreterProxy->primitiveFail();
+ if (!(isPointers(formOop))) {
+ fill = primitiveFail();
goto l1;
}
- if ((interpreterProxy->slotSizeOf(formOop)) < 5) {
- fill = interpreterProxy->primitiveFail();
+ if ((slotSizeOf(formOop)) < 5) {
+ fill = primitiveFail();
goto l1;
}
- bmBits = interpreterProxy->fetchPointerofObject(0, formOop);
@@ 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.232.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.232
Author: eem
Time: 11 December 2012, 5:47:49.686 pm
UUID: 9ecffa1b-c204-4dbd-b148-79e209e6470a
Ancestors: VMMaker.oscog-eem.231
Merge LargeInteger primitive fixes from VMMaker-dtl.286 and
tests from VMMaker-dtl.289.
=============== Diff against VMMaker.oscog-eem.231 ===============
Item was changed:
+ TestCase subclass: #BitBltSimulationTest
- ProtoObject subclass: #BitBltSimulationTest
instanceVariableNames: ''
classVariableNames: ''
poolDictionaries: ''
category: 'VMMaker-Tests'!
!BitBltSimulationTest commentStamp: 'jmv 10/26/2009 09:03' prior: 0!
These tests require VMMaker and should be considered part of it.!
Item was changed:
VMClass subclass: #InterpreterPrimitives
instanceVariableNames: 'objectMemory messageSelector argumentCount newMethod primFailCode profileMethod profileProcess profileSemaphore nextProfileTick preemptionYields'
classVariableNames: 'CrossedX EndOfRun MillisecondClockMask'
poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSqueakV3BytecodeConstants VMSqueakV3ObjectRepresentationConstants VMStackFrameOffsets'
category: 'VMMaker-Interpreter'!
+ !InterpreterPrimitives commentStamp: 'eem 12/11/2012 17:11' prior: 0!
- !InterpreterPrimitives commentStamp: 'eem 9/29/2010 18:01' 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 varioius interpreters.
Instance Variables
+ argumentCount: <Integer>
+ messageSelector: <Integer>
- argumentCount: <Integer>
- messageSelector: <Integer>
newMethod: <Integer>
nextProfileTick: <Integer>
+ objectMemory: <ObjectMemory> (simulation only)
+ preemptionYields: <Boolean>
- objectMemory: <ObjectMemory>
- 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>>isNegativeIntegerValueOf: (in category 'primitive support') -----
+ isNegativeIntegerValueOf: oop
+ "Answer true if integer object is negative.
+ Fail if object pointed by oop i not an integer."
+ | ok smallInt |
+
+ (objectMemory isIntegerObject: oop)
+ ifTrue:
+ [smallInt := objectMemory integerValueOf: oop.
+ ^smallInt < 0].
+
+ ok := objectMemory isClassOfNonImm: oop
+ equalTo: (objectMemory splObj: ClassLargePositiveInteger)
+ compactClassIndex: ClassLargePositiveIntegerCompactIndex.
+ ok ifTrue: [^false].
+
+ ok := objectMemory isClassOfNonImm: oop
+ equalTo: (objectMemory splObj: ClassLargeNegativeInteger)
+ compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
+ ok ifTrue: [^true].
+ self primitiveFail.
+ ^false!
Item was added:
+ ----- Method: InterpreterPrimitives>>magnitude64BitIntegerFor:neg: (in category 'primitive support') -----
+ magnitude64BitIntegerFor: magnitude neg: isNegative
+ "Return a Large Integer object for the given integer magnitude and sign"
+ | newLargeInteger largeClass intValue highWord sz isSmall smallVal |
+ <var: 'magnitude' type: 'usqLong'>
+ <var: 'highWord' type: 'usqInt'>
+
+ isSmall := isNegative
+ ifTrue: [magnitude <= 16r40000000]
+ ifFalse: [magnitude < 16r40000000].
+ isSmall
+ ifTrue:
+ [smallVal := self cCoerce: magnitude to: #sqInt.
+ isNegative ifTrue: [smallVal := 0 - smallVal].
+ ^self integerObjectOf: smallVal].
+ isNegative
+ ifTrue:[ largeClass := self classLargeNegativeInteger]
+ ifFalse:[ largeClass := self classLargePositiveInteger].
+ highWord := self cCode: 'magnitude >> 32'. "shift is coerced to usqInt otherwise"
+ highWord = 0
+ ifTrue: [sz := 4]
+ ifFalse:[
+ sz := 5.
+ (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1].
+ (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1].
+ (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1].
+ ].
+ newLargeInteger := self instantiateClass: largeClass indexableSize: sz.
+ 0 to: sz-1 do: [:i |
+ intValue := self cCode: '(magnitude >> (i * 8)) & 255'.
+ self storeByte: i ofObject: newLargeInteger withValue: intValue].
+ ^ newLargeInteger!
Item was added:
+ ----- Method: InterpreterPrimitives>>magnitude64BitValueOf: (in category 'primitive support') -----
+ magnitude64BitValueOf: oop
+ "Convert the given object into an integer value.
+ The object may be either a positive SmallInteger or a eight-byte LargeInteger."
+ | sz value ok smallIntValue |
+ <returnTypeC: #usqLong>
+ <var: #value type: #usqLong>
+
+ (objectMemory isIntegerObject: oop) ifTrue:
+ [smallIntValue := (objectMemory integerValueOf: oop).
+ smallIntValue < 0 ifTrue: [smallIntValue := 0 - smallIntValue].
+ ^self cCoerce: smallIntValue to: #usqLong].
+
+ ok := objectMemory isClassOfNonImm: oop
+ equalTo: (objectMemory splObj: ClassLargePositiveInteger)
+ compactClassIndex: ClassLargePositiveIntegerCompactIndex.
+ ok
+ ifFalse:
+ [ok := objectMemory isClassOfNonImm: oop
+ equalTo: (objectMemory splObj: ClassLargeNegativeInteger)
+ compactClassIndex: ClassLargeNegativeIntegerCompactIndex.
+ ok ifFalse: [^self primitiveFail]].
+ sz := objectMemory lengthOf: oop.
+ sz > (self sizeof: #sqLong asSymbol) ifTrue:
+ [^self primitiveFail].
+
+ value := 0.
+ 0 to: sz - 1 do: [:i |
+ value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))].
+ ^value!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveAddLargeIntegers (in category 'arithmetic largeint primitives') -----
primitiveAddLargeIntegers
"Primitive arithmetic operations for large integers in 64 bit range"
+ | a b result oopResult aIsNegative bIsNegative resultIsNegative oopArg oopRcvr |
- | integerRcvr integerArg result oopResult |
<export: true>
+ <var: 'a' type: 'usqLong'>
+ <var: 'b' type: 'usqLong'>
+ <var: 'result' type: 'usqLong'>
- <var: 'integerRcvr' type: 'sqLong'>
- <var: 'integerArg' type: 'sqLong'>
- <var: 'result' type: 'sqLong'>
+ oopArg := self stackValue: 0.
+ oopRcvr := self stackValue: 1.
+ aIsNegative := self isNegativeIntegerValueOf: oopRcvr.
+ bIsNegative := self isNegativeIntegerValueOf: oopArg.
+ a := self magnitude64BitValueOf: oopRcvr.
+ b := self magnitude64BitValueOf: oopArg.
- integerArg := self signed64BitValueOf: (self stackValue: 0).
- integerRcvr := self signed64BitValueOf: (self stackValue: 1).
self successful ifFalse:[^nil].
+ (aIsNegative = bIsNegative)
+ ifTrue:
+ ["Protect against overflow"
+ a > (16rFFFFFFFFFFFFFFFF - b) ifTrue: [self primitiveFail. ^nil].
+ result := a + b.
+ resultIsNegative := aIsNegative]
+ ifFalse:
+ [(a >= b)
+ ifTrue:
+ [result := a - b.
+ resultIsNegative := aIsNegative]
+ ifFalse:
+ [result := b - a.
+ resultIsNegative := bIsNegative]].
+ oopResult := self magnitude64BitIntegerFor: result neg: resultIsNegative.
+ self successful ifTrue:[self pop: 2 thenPush: oopResult].!
-
- "Compute the preliminary result (which may overflow)"
- result := integerRcvr + integerArg.
-
- "Now check overflow conditions. First is whether rcvr and arg are of the same sign.
- If they are we need to check for overflow more carefully."
- (integerRcvr bitXor: integerArg) < 0 ifFalse:[
- "Second is whether rcvr and result are of the same sign. If not, we have an overflow."
- (integerRcvr bitXor: result) < 0 ifTrue:[self primitiveFail]].
-
- self successful ifFalse:[^nil].
-
- oopResult := self signed64BitIntegerFor: result.
- self successful ifTrue:[self pop: 2 thenPush: oopResult]!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveBitShiftLargeIntegers (in category 'arithmetic largeint primitives') -----
primitiveBitShiftLargeIntegers
+ "Primitive arithmetic operations for large integers in 64 bit range"
+ | a shift result oopResult aIsNegative oopRcvr |
- "Primitive logical operations for large integers in 64 bit range"
- | shifted integerArg integerRcvr oopResult |
<export: true>
+ <var: 'a' type: 'usqLong'>
+ <var: 'result' type: 'usqLong'>
- <var: 'integerRcvr' type: 'sqLong'>
- <var: 'integerArg' type: 'sqLong'>
- <var: 'shifted' type: 'sqLong'>
+ shift := self stackIntegerValue: 0.
+ oopRcvr := self stackValue: 1.
+ aIsNegative := self isNegativeIntegerValueOf: oopRcvr.
+ a := self magnitude64BitValueOf: oopRcvr.
- integerArg := self stackIntegerValue: 0.
- integerRcvr := self signed64BitValueOf: (self stackValue: 1).
-
- self successful ifTrue: [
- integerArg >= 0 ifTrue: [
- "Left shift -- must fail if we lose bits beyond 64"
- self success: integerArg < 64.
- shifted := integerRcvr << integerArg.
- self success: integerRcvr = (self cCode: 'shifted >> integerArg'
- inSmalltalk: [shifted >> integerArg]).
- ] ifFalse: [
- "Right shift -- OK to lose bits"
- self success: integerArg > -64.
- shifted := self cCode: 'integerRcvr >> (0 - integerArg)' "right shift coerces to usqInt"
- inSmalltalk: [integerRcvr >> (0 - integerArg)]
- ].
- ].
self successful ifFalse:[^nil].
+ (shift >= 0)
+ ifTrue:
+ ["Protect against overflow"
+ result := 16rFFFFFFFFFFFFFFFF. "This is to avoid undue (usqInt) cast"
+ (shift >= 64 or: [a > (result >> shift)]) ifTrue: [self primitiveFail. ^nil].
+ result := a << shift]
+ ifFalse:
+ [shift := 0 - shift.
+ shift >= 64
+ ifTrue: [result := 0]
+ ifFalse: [result := a >> shift].
+ "Fake 2 complement for negative values"
+ (aIsNegative and: [result << shift ~= a]) ifTrue: [result := result + 1]].
+ oopResult := self magnitude64BitIntegerFor: result neg: aIsNegative.
+ self successful ifTrue:[self pop: 2 thenPush: oopResult].!
- oopResult := self signed64BitIntegerFor: shifted.
- self successful ifTrue:[self pop: 2 thenPush: oopResult]!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveDivLargeIntegers (in category 'arithmetic largeint primitives') -----
primitiveDivLargeIntegers
"Primitive arithmetic operations for large integers in 64 bit range"
+ | result oopResult a aIsNegative b bIsNegative oopArg oopRcvr rem |
- | integerRcvr integerArg result posArg posRcvr oopResult |
<export: true>
+ <var: 'a' type: 'usqLong'>
+ <var: 'b' type: 'usqLong'>
+ <var: 'result' type: 'usqLong'>
+ <var: 'rem' type: 'usqLong'>
- <var: 'integerRcvr' type: 'sqLong'>
- <var: 'integerArg' type: 'sqLong'>
- <var: 'posRcvr' type: 'sqLong'>
- <var: 'posArg' type: 'sqLong'>
- <var: 'result' type: 'sqLong'>
+ oopArg := self stackValue: 0.
+ oopRcvr := self stackValue: 1.
+ aIsNegative := self isNegativeIntegerValueOf: oopRcvr.
+ bIsNegative := self isNegativeIntegerValueOf: oopArg.
+ a := self magnitude64BitValueOf: oopRcvr.
+ b := self magnitude64BitValueOf: oopArg.
+ b = 0 ifTrue:[self primitiveFail].
- integerArg := self signed64BitValueOf: (self stackValue: 0).
- integerRcvr := self signed64BitValueOf: (self stackValue: 1).
- integerArg = 0 ifTrue:[self primitiveFail].
self successful ifFalse:[^nil].
+ result := a // b.
+
+ a = 0
+ ifFalse: [bIsNegative = aIsNegative
+ ifFalse:
+ ["Round toward negative infinity"
+ rem := a \\ b.
+ rem = 0 ifFalse:
+ ["This can not overflow, because b > 1, otherwise rem = 0"
+ result := result + 1]]].
+
+ oopResult := self magnitude64BitIntegerFor: result neg: bIsNegative ~= aIsNegative.
+ self successful ifTrue: [self pop: 2 thenPush: oopResult].!
- integerRcvr > 0
- ifTrue: [integerArg > 0
- ifTrue: [result := integerRcvr // integerArg]
- ifFalse: ["round negative result toward negative infinity"
- posArg := 0 - integerArg.
- posRcvr := integerRcvr + (posArg - 1). "can overflow!!"
- posRcvr < 0 ifTrue:[self primitiveFail].
- result := 0 - (posRcvr // posArg)]]
- ifFalse: [posRcvr := 0 - integerRcvr.
- integerArg > 0
- ifTrue: ["round negative result toward negative infinity"
- posRcvr := posRcvr + (integerArg - 1). "can overflow!!"
- posRcvr < 0 ifTrue:[self primitiveFail].
- result := 0 - (posRcvr // integerArg)]
- ifFalse: [posArg := 0 - integerArg.
- result := posRcvr // posArg]].
- self successful ifTrue:[oopResult := self signed64BitIntegerFor: result].
- self successful ifTrue:[self pop: 2 thenPush: oopResult]!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveDivideLargeIntegers (in category 'arithmetic largeint primitives') -----
primitiveDivideLargeIntegers
"Primitive arithmetic operations for large integers in 64 bit range"
+ | a b result oopResult aIsNegative bIsNegative oopArg oopRcvr |
- | integerRcvr integerArg result oopResult |
<export: true>
+ <var: 'a' type: 'usqLong'>
+ <var: 'b' type: 'usqLong'>
+ <var: 'result' type: 'usqLong'>
- <var: 'integerRcvr' type: 'sqLong'>
- <var: 'integerArg' type: 'sqLong'>
- <var: 'result' type: 'sqLong'>
+ oopArg := self stackValue: 0.
+ oopRcvr := self stackValue: 1.
+ aIsNegative := self isNegativeIntegerValueOf: oopRcvr.
+ bIsNegative := self isNegativeIntegerValueOf: oopArg.
+ a := self magnitude64BitValueOf: oopRcvr.
+ b := self magnitude64BitValueOf: oopArg.
- integerArg := self signed64BitValueOf: (self stackValue: 0).
- integerRcvr := self signed64BitValueOf: (self stackValue: 1).
- (integerArg ~= 0 and:[integerRcvr \\ integerArg = 0]) ifFalse:[self primitiveFail].
self successful ifFalse:[^nil].
+
+ "check for exact division"
+ (b ~= 0 and:[a \\ b = 0]) ifFalse:[self primitiveFail. ^nil].
+
+ result := a // b.
+ oopResult := self magnitude64BitIntegerFor: result neg: aIsNegative ~= bIsNegative.
+
+ self successful ifTrue:[self pop: 2 thenPush: oopResult].
+ !
- result := integerRcvr // integerArg.
- oopResult := self signed64BitIntegerFor: result.
- self successful ifTrue:[self pop: 2 thenPush: oopResult]!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveModLargeIntegers (in category 'arithmetic largeint primitives') -----
primitiveModLargeIntegers
"Primitive arithmetic operations for large integers in 64 bit range"
+ | result oopResult a aIsNegative b bIsNegative oopArg oopRcvr |
- | integerRcvr integerArg result oopResult |
<export: true>
+ <var: 'a' type: 'usqLong'>
+ <var: 'b' type: 'usqLong'>
+ <var: 'result' type: 'usqLong'>
- <var: 'integerRcvr' type: 'sqLong'>
- <var: 'integerArg' type: 'sqLong'>
- <var: 'result' type: 'sqLong'>
+ oopArg := self stackValue: 0.
+ oopRcvr := self stackValue: 1.
+ aIsNegative := self isNegativeIntegerValueOf: oopRcvr.
+ bIsNegative := self isNegativeIntegerValueOf: oopArg.
+ a := self magnitude64BitValueOf: oopRcvr.
+ b := self magnitude64BitValueOf: oopArg.
+ b = 0 ifTrue:[self primitiveFail].
- integerArg := self signed64BitValueOf: (self stackValue: 0).
- integerRcvr := self signed64BitValueOf: (self stackValue: 1).
- integerArg = 0 ifTrue:[self primitiveFail].
self successful ifFalse:[^nil].
+ result := a \\ b.
- result := integerRcvr \\ integerArg.
+ "Handle remainder of same sign as argument"
+ result = 0
+ ifFalse: [bIsNegative = aIsNegative
+ ifFalse: [result := b - result]].
- "ensure that the result has the same sign as the integerArg"
- integerArg < 0
- ifTrue: [result > 0
- ifTrue: [result := result + integerArg]]
- ifFalse: [result < 0
- ifTrue: [result := result + integerArg]].
+ oopResult := self magnitude64BitIntegerFor: result neg: bIsNegative.
+ self successful ifTrue: [self pop: 2 thenPush: oopResult].
+ !
- oopResult := self signed64BitIntegerFor: result.
- self successful ifTrue:[self pop: 2 thenPush: oopResult]!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveMultiplyLargeIntegers (in category 'arithmetic largeint primitives') -----
primitiveMultiplyLargeIntegers
"Primitive arithmetic operations for large integers in 64 bit range"
+ | a b result oopResult aIsNegative bIsNegative oopArg oopRcvr |
- | integerRcvr integerArg result oopResult |
<export: true>
+ <var: 'a' type: 'usqLong'>
+ <var: 'b' type: 'usqLong'>
+ <var: 'result' type: 'usqLong'>
- <var: 'integerRcvr' type: 'sqLong'>
- <var: 'integerArg' type: 'sqLong'>
- <var: 'result' type: 'sqLong'>
+ oopArg := self stackValue: 0.
+ oopRcvr := self stackValue: 1.
+ aIsNegative := self isNegativeIntegerValueOf: oopRcvr.
+ bIsNegative := self isNegativeIntegerValueOf: oopArg.
+ a := self magnitude64BitValueOf: oopRcvr.
+ b := self magnitude64BitValueOf: oopArg.
- integerArg := self signed64BitValueOf: (self stackValue: 0).
- integerRcvr := self signed64BitValueOf: (self stackValue: 1).
self successful ifFalse:[^nil].
+
+ "check for overflow"
+ (a > 1 and: [b > 1 and: [a > (16rFFFFFFFFFFFFFFFF / b)]])
+ ifTrue: [self primitiveFail. ^nil].
+ result := a * b.
+ oopResult := self magnitude64BitIntegerFor: result neg: aIsNegative ~= bIsNegative.
- result := self
- cCode: [integerRcvr * integerArg]
- inSmalltalk:
- [| twoToThe64 r |
- twoToThe64 := 2 raisedTo: 64.
- r := integerRcvr * integerArg bitAnd: twoToThe64 - 1.
- (r bitAt: 64) = 0 ifTrue: [r] ifFalse: [r - twoToThe64]].
- "check for C overflow by seeing if computation is reversible"
- ((integerArg = 0) or: [(result // integerArg) = integerRcvr])
- ifTrue:[oopResult := self signed64BitIntegerFor: result]
- ifFalse: [self primitiveFail].
+ self successful ifTrue:[self pop: 2 thenPush: oopResult].
+ !
- self successful ifTrue:[self pop: 2 thenPush: oopResult]!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveQuoLargeIntegers (in category 'arithmetic largeint primitives') -----
primitiveQuoLargeIntegers
"Primitive arithmetic operations for large integers in 64 bit range"
+ | result oopResult a aIsNegative b bIsNegative oopArg oopRcvr |
- | integerRcvr integerArg result oopResult |
<export: true>
+ <var: 'a' type: 'usqLong'>
+ <var: 'b' type: 'usqLong'>
+ <var: 'result' type: 'usqLong'>
- <var: 'integerRcvr' type: 'sqLong'>
- <var: 'integerArg' type: 'sqLong'>
- <var: 'result' type: 'sqLong'>
+ oopArg := self stackValue: 0.
+ oopRcvr := self stackValue: 1.
+ aIsNegative := self isNegativeIntegerValueOf: oopRcvr.
+ bIsNegative := self isNegativeIntegerValueOf: oopArg.
+ a := self magnitude64BitValueOf: oopRcvr.
+ b := self magnitude64BitValueOf: oopArg.
+ b = 0 ifTrue:[self primitiveFail].
- integerArg := self signed64BitValueOf: (self stackValue: 0).
- integerRcvr := self signed64BitValueOf: (self stackValue: 1).
- integerArg = 0 ifTrue:[self primitiveFail].
self successful ifFalse:[^nil].
+ result := a // b.
- integerRcvr > 0 ifTrue: [
- integerArg > 0
- ifTrue: [result := integerRcvr // integerArg]
- ifFalse: [result := 0 - (integerRcvr // (0 - integerArg))].
- ] ifFalse: [
- integerArg > 0
- ifTrue: [result := 0 - ((0 - integerRcvr) // integerArg)]
- ifFalse: [result := (0 - integerRcvr) // (0 - integerArg)].
- ].
+ oopResult := self magnitude64BitIntegerFor: result neg: bIsNegative ~= aIsNegative.
+ self successful ifTrue: [self pop: 2 thenPush: oopResult].!
- oopResult := self signed64BitIntegerFor: result.
- self successful ifTrue:[self pop: 2 thenPush: oopResult]!
Item was added:
+ ----- Method: InterpreterPrimitives>>primitiveRemLargeIntegers (in category 'arithmetic largeint primitives') -----
+ primitiveRemLargeIntegers
+ "Primitive arithmetic operations for large integers in 64 bit range"
+ | result oopResult a aIsNegative b bIsNegative oopArg oopRcvr |
+ <export: true>
+ <var: 'a' type: 'usqLong'>
+ <var: 'b' type: 'usqLong'>
+ <var: 'result' type: 'usqLong'>
+
+ oopArg := self stackValue: 0.
+ oopRcvr := self stackValue: 1.
+ aIsNegative := self isNegativeIntegerValueOf: oopRcvr.
+ bIsNegative := self isNegativeIntegerValueOf: oopArg.
+ a := self magnitude64BitValueOf: oopRcvr.
+ b := self magnitude64BitValueOf: oopArg.
+ b = 0 ifTrue:[self primitiveFail].
+ self successful ifFalse:[^nil].
+
+ result := a \\ b.
+
+ oopResult := self magnitude64BitIntegerFor: result neg: aIsNegative ~= bIsNegative.
+ self successful ifTrue: [self pop: 2 thenPush: oopResult].!
Item was changed:
----- Method: InterpreterPrimitives>>primitiveSubtractLargeIntegers (in category 'arithmetic largeint primitives') -----
primitiveSubtractLargeIntegers
"Primitive arithmetic operations for large integers in 64 bit range"
+ | a b result oopResult aIsNegative bIsNegative resultIsNegative oopArg oopRcvr |
- | integerRcvr integerArg integerArgNegated result oopResult |
<export: true>
+ <var: 'a' type: 'usqLong'>
+ <var: 'b' type: 'usqLong'>
+ <var: 'result' type: 'usqLong'>
- <var: 'integerRcvr' type: 'sqLong'>
- <var: 'integerArg' type: 'sqLong'>
- <var: 'integerArgNegated' type: 'sqLong'>
- <var: 'result' type: 'sqLong'>
+ oopArg := self stackValue: 0.
+ oopRcvr := self stackValue: 1.
+ aIsNegative := self isNegativeIntegerValueOf: oopRcvr.
+ bIsNegative := self isNegativeIntegerValueOf: oopArg.
+ a := self magnitude64BitValueOf: oopRcvr.
+ b := self magnitude64BitValueOf: oopArg.
+ self successful ifFalse:[^nil].
+ (aIsNegative ~= bIsNegative)
+ ifTrue:
+ ["Protect against overflow"
+ a > (16rFFFFFFFFFFFFFFFF - b) ifTrue: [self primitiveFail. ^nil].
+ result := a + b.
+ resultIsNegative := aIsNegative]
- integerArg := self signed64BitValueOf: (self stackValue: 0).
- integerRcvr := self signed64BitValueOf: (self stackValue: 1).
- self successful ifFalse:
- [^nil].
-
- "In the test for the argument being most -ve we would
- have to check for zero if we don't do so here.
- So do so here and short-circuit the whole subtraction."
- integerArg = 0
- ifTrue: [result := integerRcvr]
ifFalse:
+ [(a >= b)
+ ifTrue:
+ [result := a - b.
+ resultIsNegative := aIsNegative]
+ ifFalse:
+ [result := b - a.
+ resultIsNegative := aIsNegative not]].
+ oopResult := self magnitude64BitIntegerFor: result neg: resultIsNegative.
+ self successful ifTrue:[self pop: 2 thenPush: oopResult].
+ !
- ["Reverse the argument so that we can recycle the overflow code from addition.
- But the most -ve 64-bit value can overflow, so check; 0 - most -ve = most -ve"
- integerArgNegated := 0 - integerArg.
- integerArgNegated = integerArg ifTrue:
- [^self primitiveFail].
-
- "Compute the preliminary result (which may overflow)"
- result := integerRcvr + integerArgNegated.
-
- "Now check overflow conditions. First is whether rcvr and arg are of the same sign.
- If they are we need to check for overflow more carefully."
- (integerRcvr bitXor: integerArgNegated) < 0 ifFalse:
- "Second is whether rcvr and result are of the same sign. If not, we have an overflow."
- [(integerRcvr bitXor: result) < 0 ifTrue:
- [^self primitiveFail]]].
-
- oopResult := self signed64BitIntegerFor: result.
- self successful ifTrue:
- [self pop: 2 thenPush: oopResult]!
Item was added:
+ TestCase subclass: #InterpreterPrimitivesTest
+ instanceVariableNames: ''
+ classVariableNames: ''
+ poolDictionaries: ''
+ category: 'VMMaker-Tests'!
+
+ !InterpreterPrimitivesTest commentStamp: 'dtl 7/27/2011 11:32' prior: 0!
+ InterpreterPrimitivesTest provides test coverage for certain potentially problematic
+ primitives and methods in the interpreter.!
Item was added:
+ ----- Method: InterpreterPrimitivesTest>>expectedFailures (in category 'testing') -----
+ expectedFailures
+ ^#("testPrimitiveSubtractLargeIntegersParameterBounds")!
Item was added:
+ ----- Method: InterpreterPrimitivesTest>>testPrimitiveSubtractLargeIntegersParameterBounds (in category 'testing - primitiveSubtractLargeIntegers') -----
+ testPrimitiveSubtractLargeIntegersParameterBounds
+ "Prior to VMMaker VMMaker 4.10.1 enhancement by Nicolas Cellier, range was
+ restricted and this test would fail."
+
+ | intOne intTwo |
+ "LargeNegativeInteger at lower range boundary"
+ intOne := -16r8000000000000000. "maximum negative 64 bit value"
+ intTwo := -16r7FFFFFFFFFFFFFFF.
+ self shouldnt: [intTwo minus64: intOne]
+ raise: Error.
+ !
Item was added:
+ ----- Method: InterpreterPrimitivesTest>>testSigned64BitValueOfLargeNegativeInteger (in category 'testing - signed64BitValueOf') -----
+ testSigned64BitValueOfLargeNegativeInteger
+ "Exercise #signed64BitValueOf: using a LargeNegativeInteger at the maximum of
+ its range. Note, IntegerArrayTest provides coverage of 32-bit equivalent."
+
+ | intOne diff intTwo |
+ "LargeNegativeInteger at lower range boundary"
+ intOne := -16r8000000000000000. "maximum negative 64 bit value"
+ intTwo := -16r7FFFFFFFFFFFFFFF.
+ self shouldnt: [diff := intOne minus64: intTwo]
+ raise: Error.
+ self assert: diff = -1.
+
+ "See testPrimitiveSubtractLargeIntegersParameterBounds"
+ "self shouldnt: [diff := intTwo minus64: intOne]
+ raise: Error.
+ self assert: diff = 1."
+
+ self shouldnt: [diff := intOne minus64: -1]
+ raise: Error.
+ self assert: diff = intTwo.
+
+ "Parameters exceeding allowable range"
+ "Prior to VMMaker VMMaker 4.10.1 enhancement by Nicolas Cellier, range was
+ restricted and the following would raise errors."
+ intOne := -16r8000000000000000 - 1. "exceed most negative 64 bit twos complement"
+ intTwo := -16r7FFFFFFFFFFFFFFF.
+ diff := intOne minus64: intTwo.
+ self assert: diff = -2.
+ diff := intTwo minus64: intOne.
+ self assert: diff = 2.
+ "Full 64 bit magnitude range is now available"
+ intOne := -16rFFFFFFFFFFFFFFFF. ""
+ intTwo := -16rFFFFFFFFFFFFFFFE.
+ diff := intOne minus64: intTwo.
+ self assert: diff = -1.
+ diff := intTwo minus64: intOne.
+ self assert: diff = 1.
+ intOne := 16rFFFFFFFFFFFFFFFF. ""
+ intTwo := 16rFFFFFFFFFFFFFFFE.
+ diff := intOne minus64: intTwo.
+ self assert: diff = 1.
+ diff := intTwo minus64: intOne.
+ self assert: diff = -1.
+ "Out of range"
+ intOne := -16rFFFFFFFFFFFFFFFF - 1. "exceed most negative 64 bit unsigned magnitude"
+ intTwo := -16rFFFFFFFFFFFFFFFF.
+ self should: [intOne minus64: intTwo]
+ raise: Error.
+ self should: [intTwo minus64: intOne]
+ raise: Error.
+ !
Item was added:
+ ----- Method: InterpreterPrimitivesTest>>testSigned64BitValueOfLargePositiveInteger (in category 'testing - signed64BitValueOf') -----
+ testSigned64BitValueOfLargePositiveInteger
+ "Exercise #signed64BitValueOf: using a LargePositiveInteger at the maximum of
+ its range. Note, IntegerArrayTest provides coverage of 32-bit equivalent."
+
+ | intOne diff intTwo |
+ "LargePositiveInteger at upper range boundary"
+ intOne := 16r7FFFFFFFFFFFFFFF. "maximum 64 bit positive"
+ intTwo := 16r7FFFFFFFFFFFFFFE.
+ self shouldnt: [diff := intOne minus64: intTwo]
+ raise: Error.
+ self assert: diff = 1.
+ self shouldnt: [diff := intTwo minus64: intOne]
+ raise: Error.
+ self assert: diff = -1.
+ self shouldnt: [diff := intOne minus64: 1]
+ raise: Error.
+ self assert: diff = intTwo.
+
+ "Parameters exceeding allowable range"
+ "Prior to VMMaker VMMaker 4.10.1 enhancement by Nicolas Cellier, range was
+ restricted and the following would raise errors."
+ intOne := 16r7FFFFFFFFFFFFFFF + 1. "exceed maximum 64 bit twos complement positive"
+ intTwo := 16r7FFFFFFFFFFFFFFE.
+ diff := intOne minus64: intTwo.
+ self should: diff = 2.
+ diff := intTwo minus64: intOne.
+ self should: diff = -2.
+
+ "Full 64 bit magnitude range is now available"
+ intOne := 16rFFFFFFFFFFFFFFFF.
+ intTwo := 16rFFFFFFFFFFFFFFFE.
+ diff := intOne minus64: intTwo.
+ self should: diff = 1.
+ diff := intTwo minus64: intOne.
+ self should: diff = -1.
+
+ intOne := 16rFFFFFFFFFFFFFFFF + 1. "exceed maximum 64 bit unsigned magnitude"
+ intTwo := 16rFFFFFFFFFFFFFFFE.
+ self should: [intOne minus64: intTwo]
+ raise: Error.
+ self should: [intTwo minus64: intOne]
+ raise: Error.
+ !
Item was added:
+ ----- Method: LargePositiveInteger>>minus64: (in category '*VMMaker-Tests') -----
+ minus64: anInteger
+ "For unit test support only. Subtract two large integers, raising an error on failure."
+
+ <primitive: 22>
+ ^self primitiveFailed!
1
0