Vm-dev November 2014

vm-dev@lists.squeakfoundation.org

36 participants
165 discussions

VM Maker: VMMaker.oscog-eem.931.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.931.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.931 Author: eem Time: 14 November 2014, 11:34:08.053 am UUID: 13d1914a-98dc-4d3a-8e80-ec9ce100239b Ancestors: VMMaker.oscog-eem.930 Yet more tweaking to get the same inlining behaviour as before the constant to send putch for ShiftForWord. Refactor mostBasicConstantSelectors etc into the class side of VMBasicConstants. =============== Diff against VMMaker.oscog-eem.930 =============== Item was changed: ----- Method: CCodeGenerator>>isConstantNode:valueInto: (in category 'utilities') ----- isConstantNode: aNode valueInto: aBlock "Answer if aNode evaluates to a constant, and if so, evaluate aBlock with the value of that constant." aNode isConstant ifTrue: [aBlock value: aNode value. ^true]. aNode isSend ifFalse: [^false]. + (self anyMethodNamed: aNode selector) + ifNil: + [(VMBasicConstants valueOfBasicSelector: aNode selector) ifNotNil: + [:value| + aBlock value: value. + ^true]] + ifNotNil: + [:m| + (m statements size = 1 + and: [m statements last isReturn]) ifTrue: + [^self isConstantNode: m statements last expression valueInto: aBlock]]. - (self anyMethodNamed: aNode selector) ifNotNil: - [:m| - (m statements size = 1 - and: [m statements last isReturn]) ifTrue: - [^self isConstantNode: m statements last expression valueInto: aBlock]]. ^false! Item was removed: - ----- Method: CCodeGenerator>>mostBasicConstantSelectors (in category 'accessing') ----- - mostBasicConstantSelectors - "c.f. VMBasicConstants class>>#mostBasicConstantNames" - ^#(baseHeaderSize bytesPerOop bytesPerWord shiftForWord wordSize)! Item was changed: ----- Method: CCodeGenerator>>shouldGenerateAsInterpreterProxySend: (in category 'utilities') ----- shouldGenerateAsInterpreterProxySend: aSendNode ^(self messageReceiverIsInterpreterProxy: aSendNode) + and: [(VMBasicConstants mostBasicConstantSelectors includes: aSendNode selector) not]! - and: [(self mostBasicConstantSelectors includes: aSendNode selector) not]! Item was changed: ----- Method: TMethod>>isNode:substitutableFor:inMethod:in: (in category 'inlining') ----- isNode: aNode substitutableFor: argName inMethod: targetMeth in: aCodeGen "Answer if the given parameter node may be substituted directly into the body of the method during inlining, instead of being bound to the actual parameter variable. We allow a constant, a local variable, or a formal parameter, or simple expressions involving only these to to be directly substituted. Note that global variables cannot be subsituted into methods with possible side effects (i.e., methods that may assign to global variables) because the inlined method might depend on having the value of the global variable captured when it is passed in as an argument." | madeNonTrivialCall count constantExpression usageCount | aNode isConstant ifTrue: [^true]. aNode isVariable ifTrue: [((locals includes: aNode name) or: [(args includes: aNode name) or: [#('self' 'true' 'false' 'nil') includes: aNode name]]) ifTrue: [^true]. "We can substitute any variable provided it is only read in the method being inlined, and if it is not read after any non-trivial call (which may update the variable)." madeNonTrivialCall := false. (targetMeth isComplete and: [targetMeth parseTree noneSatisfy: [:node| (node isSend and: [(aCodeGen isBuiltinSelector: node selector) not]) ifTrue: [madeNonTrivialCall := true]. (madeNonTrivialCall and: [node isVariable and: [node name = argName]]) or: [node isAssignment and: [node variable name = argName]]] unless: [:node| node isSend and: [aCodeGen isAssertSelector: node selector]]]) ifTrue: [^true]. ^targetMeth maySubstituteGlobal: aNode name in: aCodeGen]. "For now allow literal blocks to be substituted. They better be accessed only with value[:value:*] messages though!!" aNode isStmtList ifTrue: [^true]. count := 0. constantExpression := true. "scan expression tree; must contain only constants, builtin ops, and inlineable vars" aNode nodesDo: [:node| node isConstant ifTrue: [] ifFalse: [node isSend ifTrue: + [((VMBasicConstants mostBasicConstantSelectors includes: node selector) - [((aCodeGen mostBasicConstantSelectors includes: node selector) or: [node isBuiltinOperator]) ifFalse: [^false]. count := count + 1] ifFalse: [node isVariable ifTrue: [(aCodeGen isNonArgumentImplicitReceiverVariableName: node name) ifFalse: [constantExpression := false. ((locals includes: node name) or: [(args includes: node name) or: [(#('self' 'true' 'false' 'nil') includes: node name) or: [targetMeth maySubstituteGlobal: node name in: aCodeGen]]]) ifFalse: [^false]]] ifFalse: [^false]]]]. "inline constant expressions" constantExpression ifNil: [^true]. "scan target to find usage count" usageCount := 0. targetMeth parseTree nodesDo: [:node| (node isVariable and: [node name = argName]) ifTrue: [usageCount := usageCount + 1]]. "Now only inline expressions if they are used only once or are simple w.r.t. the usage count; a heuristic that seems to work well enough." ^usageCount = 1 or: [count <= usageCount]! Item was changed: ----- Method: TSendNode>>bindVariableUsesIn:andConstantFoldIf:in: (in category 'transformations') ----- bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen "Answer either the receiver, if it contains no references to the given variables, or a new node with the given variables rebound. Attempt to constant-fold and answer a constant node commented with the original expression. Commenting with the original expression is important because it allows us to detect shared cases. e.g. currentBytecode bitAnd: 15 is the same in case 1 and case 17, but '1 /* 1 bitAnd: 15 */' differs from '1 /* 17 bitAnd: 15 */', whereas '1 /* currentBytecode bitAnd: 15 */' doesn't change." | newReceiver newArguments | "Constant-fold shiftForWord, but not BytesPerWord" + ((VMBasicConstants mostBasicConstantSelectors includes: selector) - ((codeGen mostBasicConstantSelectors includes: selector) and: [(codeGen isBuiltinSelector: selector) not]) ifTrue: [codeGen isConstantNode: self valueInto: [:val| ^TConstantNode new setValue: val; yourself]]. newReceiver := receiver bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen. newArguments := arguments collect: [:a| a bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen]. (newReceiver = receiver and: [newArguments = arguments]) ifTrue: [^self]. (constantFold and: [newReceiver isConstant and: [newReceiver value isInteger] and: [(newArguments allSatisfy: [:ea| ea isConstant and: [ea value isInteger]]) and: [codeGen isBuiltinSelector: selector]]]) ifTrue: [| value | value := [newReceiver value perform: selector withArguments: (newArguments collect: [:ea| ea value])] on: Error do: [:ea| nil]. (value isInteger or: [value == true or: [value == false]]) ifTrue: [^TConstantNode new setValue: value; "We assume Message prints its keywords and arguments interleaved. e.g. that (Message selector: #between:and: arguments: #(0 1)) printString = 'between: 0 and: 1'" comment: (receiver isLeaf ifTrue: [receiver printString] ifFalse: ['(', receiver printString, ')']), ' ', (Message selector: selector arguments: (arguments collect: [:ea| ea value])) printString; yourself]]. ^self shallowCopy receiver: newReceiver; arguments: newArguments; yourself ! Item was changed: + ----- Method: VMBasicConstants class>>mostBasicConstantNames (in category 'C translation') ----- - ----- Method: VMBasicConstants class>>mostBasicConstantNames (in category 'accessing') ----- mostBasicConstantNames + "c.f. mostBasicConstantSelectors" + ^#(BaseHeaderSize BytesPerWord BytesPerOop ShiftForWord BytesPerWord)! - "c.f. CCodeGenerator class>>#mostBasicConstantSelectors" - ^#(BaseHeaderSize BytesPerWord BytesPerOop)! Item was added: + ----- Method: VMBasicConstants class>>mostBasicConstantSelectors (in category 'C translation') ----- + mostBasicConstantSelectors + "c.f. mostBasicConstantNames" + ^#(baseHeaderSize wordSize bytesPerOop shiftForWord bytesPerWord "bytesPerWord isn't used, but kept for history")! Item was added: + ----- Method: VMBasicConstants class>>valueOfBasicSelector: (in category 'C translation') ----- + valueOfBasicSelector: selector + "Answer the numberic value of a basic constant accessed via the selector. + Answer nil if selector is not a basic constant accessor." + "self mostBasicConstantSelectors collect: [:s| {s. self valueOfBasicSelector: s}]" + | index key | + ^((index := self mostBasicConstantSelectors indexOf: selector) > 0 + and: [(key := self mostBasicConstantNames at: index ifAbsent: []) notNil + and: [self includesKey: key]]) ifTrue: + [classPool at: key]!

1 0

VM Maker: VMMaker.oscog-eem.930.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.930.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.930 Author: eem Time: 14 November 2014, 10:29:42.849 am UUID: 050e5e3c-ef02-46ae-b867-db538668688e Ancestors: VMMaker.oscog-eem.929 Fix some bugs in V3 given the new handling of code gen for bytesPerOop et al. =============== Diff against VMMaker.oscog-eem.929 =============== Item was changed: ----- Method: ObjectMemory>>cCoerceSimple:to: (in category 'simulation support') ----- cCoerceSimple: value to: cTypeString + <doNotGenerate> ^cTypeString caseOf: { [#'char *'] -> [value] }! Item was changed: ----- Method: ObjectMemory>>shiftForWord (in category 'interpreter access') ----- shiftForWord "N.B. This would appear to hard-code the header size for 32-bit images. But if generating a 64-bit image, this method could be removed and the relevant one substituted. We can't mark this method as <doNotGenerate> as we need an actual method to guide code gen." + <api> + <cmacro: '() 2'> ^2!

1 0

Spur Identity Hash [was: The Trunk: System-cmm.689.mcz]
by Eliot Miranda 14 Nov '14

14 Nov '14

Hi Chris, interesting! On Wed, Nov 12, 2014 at 1:40 PM, Chris Muller <asqueaker(a)gmail.com> wrote: > I finally tracked down why the keys of the #knownEnvironments > Dictionary were changing when trying to build an image in Spur. > > It's because, in my core-extensions package, I override > UndefinedObject>>#hash to have hard-coded value independent of its > #identityHash, to be safer with distributed systems which may be using > nil in a hash calculation -- in case they would be different due to > accessing with a Spur image, for example. > > Such a hash calculation is made for the keys of the #knownEnvironments > Dictionary when the country's are nil. By the different hash value in > Spur, the image would lock when trying to load my core-extensions > package, because it tried to access knownEnvironments as part of the > load-operation itself. > > The least-lazy way to "fix" it was to ensure something is populated in > the LocaleID's 'country's. Whew! > > Anyway, something to be aware of -- anywhere we have true, false or > nil used in a hash calculation, now has a different hash in Spur vs. > Cog. Maybe we should think about separating those objects' logical > "value" hash from their identityHash in trunk..? That could be useful > when we move to 64-bit someday.. > Remember that Spur has a common header format for both 32-bit and 64-bit versions, so in both there is a 22-bit identityHash and hence the identityHashes of all objects in a 64-bit Spur image bootstrapped from a 32-bit Spur image will be _unchanged_. Convenient. So no need to worry. And it should be the case that a freshly bootstrapped 64-bit Spur image does not need to be rehashed to function properly. But while we're on the subject, one thing we could do is arrange that Symbols have an identityHash based on their value. So when interning a string we'd compute its string hash and derive and assign the identityHash of the Symbol from the string hash. That would mean that when unpickling classes in e.g. Fuel we would not have to rehash method dictionaries, which would be very nice indeed. On Wed, Nov 12, 2014 at 3:26 PM, <commits(a)source.squeak.org> wrote: > > Chris Muller uploaded a new version of System to project The Trunk: > > http://source.squeak.org/trunk/System-cmm.689.mcz > > > > ==================== Summary ==================== > > > > Name: System-cmm.689 > > Author: cmm > > Time: 12 November 2014, 3:19:56.156 pm > > UUID: a1ffba24-42ff-4391-9387-4e8ee20e6b2a > > Ancestors: System-ul.688 > > > > Populate all LocaleID's 'country's. > > > > =============== Diff against System-ul.688 =============== > > > > Item was added: > > + ----- Method: LocaleID class>>countryFor: (in category 'accessing') > ----- > > + countryFor: iso6391Code > > + "http://www.loc.gov/standards/iso639-2/php/code_list.php" > > + ^ iso6391Code > > + caseOf: > > + { ['af'] -> ['Afrikaans']. > > + ['ca'] -> ['Catalan']. > > + ['cs'] -> [ 'Czech']. > > + ['da'] -> [ 'Danish']. > > + ['de'] -> [ 'German']. > > + ['el'] -> [ 'Greek Modern']. > > + ['en'] -> [ 'English']. > > + ['es'] -> [ 'Spanish']. > > + ['eu'] -> [ 'Basque']. > > + ['fi'] -> [ 'Finnish']. > > + ['fo'] -> [ 'Faroese']. > > + ['fr'] -> [ 'French']. > > + ['ga'] -> [ 'Irish']. > > + ['gd'] -> [ 'Gaelic']. > > + ['hr'] -> [ 'Croatian']. > > + ['hu'] -> [ 'Hungarian']. > > + ['is'] -> [ 'Icelandic']. > > + ['it'] -> [ 'Italian']. > > + ['ja'] -> [ 'Japanese']. > > + ['ja-etoys'] -> [ 'Japanese']. > > + ['ko'] -> [ 'Korean']. > > + ['nl'] -> [ 'Dutch']. > > + ['no'] -> [ 'Norwegian']. > > + ['pt'] -> [ 'Portuguese']. > > + ['rm'] -> [ 'Romansh']. > > + ['ro'] -> [ 'Romainian']. > > + ['sk'] -> [ 'Slovak']. > > + ['sl'] -> [ 'Slovenian']. > > + ['sq'] -> [ 'Albanian']. > > + ['sv'] -> [ 'Swedish']. > > + ['sw'] -> [ 'Swahili']. > > + ['zh'] -> [ 'Chinese'] } > > + otherwise: > > + [ 'other' ]! > > > > Item was changed: > > ----- Method: LocaleID>>isoLanguage:isoCountry: (in category > 'initialize') ----- > > + isoLanguage: langString isoCountry: countryStringOrNil > > - isoLanguage: langString isoCountry: countryStringOrNil > > isoLanguage := langString. > > + isoCountry := countryStringOrNil ifNil: (self class countryFor: > langString)! > > - isoCountry := countryStringOrNil! > > > > Item was changed: > > (PackageInfo named: 'System') postscript: '"Preferences already > removed by hand, but whose state still lingers:" > > + LocaleID allInstances do: > > + [ : each | each > > + isoLanguage: each isoLanguage > > + isoCountry: (each isoCountry ifNil: [ each isoCountry ]) > ]. > > + LanguageEnvironment knownEnvironments rehash'! > > - Preferences removePreference: #upgradeIsMerge. > > - Preferences removePreference: #colorWhenPrettyPrinting. > > - Preferences removePreference: #promptForUpdateServer. > > - Preferences removePreference: #updateSavesFile. > > - Preferences removePreference: #updateFromServerAtStartup.'! > > > > > > -- best, Eliot

3 2

Cog misses some changes for win32
by Levente Uzonyi 14 Nov '14

14 Nov '14

Hi All, I was looking for a way to find the local nameservers from an image, and I found that Andreas has already added a primitive for that for the win32 platform, but this happened a month after Cog was forked from the trunk, so the primitive is present in the Interpreter VM, but not in Cog. I'd like to use this primitive, so I'm asking someone (Eliot maybe) to add it to the Cog branch. The primitive was added in revision 2249: http://squeakvm.org/cgi-bin/viewvc.cgi/squeak?view=revision&revision=2249

2 3

VM Maker: VMMaker.oscog-eem.929.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.929.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.929 Author: eem Time: 13 November 2014, 7:39:51.258 pm UUID: 03ec1944-f1e5-4f50-a4b7-7a73a8d9b42f Ancestors: VMMaker.oscog-eem.928 More tweaking to get the same inlining behaviour as before the constant to send putch for ShiftForWord. =============== Diff against VMMaker.oscog-eem.928 =============== Item was changed: ----- Method: CCodeGenerator>>mostBasicConstantSelectors (in category 'accessing') ----- mostBasicConstantSelectors "c.f. VMBasicConstants class>>#mostBasicConstantNames" + ^#(baseHeaderSize bytesPerOop bytesPerWord shiftForWord wordSize)! - ^#(baseHeaderSize bytesPerOop bytesPerWord wordSize)! Item was changed: ----- Method: TMethod>>isNode:substitutableFor:inMethod:in: (in category 'inlining') ----- isNode: aNode substitutableFor: argName inMethod: targetMeth in: aCodeGen "Answer if the given parameter node may be substituted directly into the body of the method during inlining, instead of being bound to the actual parameter variable. We allow a constant, a local variable, or a formal parameter, or simple expressions involving only these to to be directly substituted. Note that global variables cannot be subsituted into methods with possible side effects (i.e., methods that may assign to global variables) because the inlined method might depend on having the value of the global variable captured when it is passed in as an argument." | madeNonTrivialCall count constantExpression usageCount | aNode isConstant ifTrue: [^true]. aNode isVariable ifTrue: [((locals includes: aNode name) or: [(args includes: aNode name) or: [#('self' 'true' 'false' 'nil') includes: aNode name]]) ifTrue: [^true]. "We can substitute any variable provided it is only read in the method being inlined, and if it is not read after any non-trivial call (which may update the variable)." madeNonTrivialCall := false. (targetMeth isComplete and: [targetMeth parseTree noneSatisfy: [:node| (node isSend and: [(aCodeGen isBuiltinSelector: node selector) not]) ifTrue: [madeNonTrivialCall := true]. (madeNonTrivialCall and: [node isVariable and: [node name = argName]]) or: [node isAssignment and: [node variable name = argName]]] unless: [:node| node isSend and: [aCodeGen isAssertSelector: node selector]]]) ifTrue: [^true]. ^targetMeth maySubstituteGlobal: aNode name in: aCodeGen]. "For now allow literal blocks to be substituted. They better be accessed only with value[:value:*] messages though!!" aNode isStmtList ifTrue: [^true]. count := 0. constantExpression := true. "scan expression tree; must contain only constants, builtin ops, and inlineable vars" aNode nodesDo: [:node| node isConstant ifTrue: [] ifFalse: [node isSend ifTrue: + [((aCodeGen mostBasicConstantSelectors includes: node selector) + or: [node isBuiltinOperator]) ifFalse: [^false]. - [node isBuiltinOperator ifFalse: [^false]. count := count + 1] ifFalse: [node isVariable ifTrue: + [(aCodeGen isNonArgumentImplicitReceiverVariableName: node name) ifFalse: + [constantExpression := false. + ((locals includes: node name) + or: [(args includes: node name) + or: [(#('self' 'true' 'false' 'nil') includes: node name) + or: [targetMeth maySubstituteGlobal: node name in: aCodeGen]]]) ifFalse: [^false]]] ifFalse: - [constantExpression := false. - ((locals includes: node name) or: - [(args includes: node name) or: - [(#('self' 'true' 'false' 'nil') includes: node name) or: - [targetMeth maySubstituteGlobal: node name in: aCodeGen]]]) ifFalse: [^false]] ifFalse: [^false]]]]. "inline constant expressions" constantExpression ifNil: [^true]. "scan target to find usage count" usageCount := 0. targetMeth parseTree nodesDo: [:node| (node isVariable and: [node name = argName]) ifTrue: [usageCount := usageCount + 1]]. "Now only inline expressions if they are used only once or are simple w.r.t. the usage count; a heuristic that seems to work well enough." ^usageCount = 1 or: [count <= usageCount]! Item was changed: ----- Method: TSendNode>>bindVariableUsesIn:andConstantFoldIf:in: (in category 'transformations') ----- bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen "Answer either the receiver, if it contains no references to the given variables, or a new node with the given variables rebound. Attempt to constant-fold and answer a constant node commented with the original expression. Commenting with the original expression is important because it allows us to detect shared cases. e.g. currentBytecode bitAnd: 15 is the same in case 1 and case 17, but '1 /* 1 bitAnd: 15 */' differs from '1 /* 17 bitAnd: 15 */', whereas '1 /* currentBytecode bitAnd: 15 */' doesn't change." | newReceiver newArguments | + "Constant-fold shiftForWord, but not BytesPerWord" + ((codeGen mostBasicConstantSelectors includes: selector) + and: [(codeGen isBuiltinSelector: selector) not]) ifTrue: + [codeGen isConstantNode: self valueInto: + [:val| + ^TConstantNode new + setValue: val; + yourself]]. newReceiver := receiver bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen. newArguments := arguments collect: [:a| a bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen]. (newReceiver = receiver and: [newArguments = arguments]) ifTrue: [^self]. (constantFold and: [newReceiver isConstant and: [newReceiver value isInteger] and: [(newArguments allSatisfy: [:ea| ea isConstant and: [ea value isInteger]]) and: [codeGen isBuiltinSelector: selector]]]) ifTrue: [| value | value := [newReceiver value perform: selector withArguments: (newArguments collect: [:ea| ea value])] on: Error do: [:ea| nil]. (value isInteger or: [value == true or: [value == false]]) ifTrue: [^TConstantNode new setValue: value; "We assume Message prints its keywords and arguments interleaved. e.g. that (Message selector: #between:and: arguments: #(0 1)) printString = 'between: 0 and: 1'" comment: (receiver isLeaf ifTrue: [receiver printString] ifFalse: ['(', receiver printString, ')']), ' ', (Message selector: selector arguments: (arguments collect: [:ea| ea value])) printString; yourself]]. ^self shallowCopy receiver: newReceiver; arguments: newArguments; yourself !

1 0

[commit][3132] Add accessorDepths for the exported browser plugin primitives for Spur.
by commits＠squeakvm.org 14 Nov '14

14 Nov '14

Revision: 3132 Author: eliot Date: 2014-11-13 19:43:01 -0800 (Thu, 13 Nov 2014) Log Message: ----------- Add accessorDepths for the exported browser plugin primitives for Spur. Modified Paths: -------------- branches/Cog/platforms/Mac OS/vm/osExports.c branches/Cog/platforms/RiscOS/vm/osExports.c branches/Cog/platforms/unix/vm/osExports.c branches/Cog/platforms/win32/vm/sqWin32Exports.c Added Paths: ----------- branches/Cog/scripts/svntouch Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Nov 12 11:52:26 PST 2014 + Thu Nov 13 19:43:10 PST 2014 Modified: branches/Cog/platforms/Mac OS/vm/osExports.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/osExports.c 2014-11-13 22:36:48 UTC (rev 3131) +++ branches/Cog/platforms/Mac OS/vm/osExports.c 2014-11-14 03:43:01 UTC (rev 3132) @@ -17,7 +17,7 @@ /* duh ... this is ugly */ #define XFN(export) {"", #export, (void*)export}, -#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export}, +#define XFND(export,depth) {"", #export "\000" depth, (void*)export}, WindowPtr getSTWindow(void); void setMessageHook(eventMessageHook theHook); @@ -60,14 +60,14 @@ /* Plugin support primitives We should make these primitives a proper plugin but right now we just need the exports. */ - XFN(primitivePluginBrowserReady) + XFND(primitivePluginBrowserReady,"\377") #ifdef ENABLE_URL_FETCH - XFN(primitivePluginRequestURLStream) - XFN(primitivePluginRequestURL) - XFN(primitivePluginPostURL) - XFN(primitivePluginRequestFileHandle) - XFN(primitivePluginDestroyRequest) - XFN(primitivePluginRequestState) + XFND(primitivePluginRequestURLStream,"\001") + XFND(primitivePluginRequestURL,"\001") + XFND(primitivePluginPostURL,"\001") + XFND(primitivePluginRequestFileHandle,"\000") + XFND(primitivePluginDestroyRequest,"\000") + XFND(primitivePluginRequestState,"\000") #endif {NULL, NULL, NULL} }; Modified: branches/Cog/platforms/RiscOS/vm/osExports.c =================================================================== --- branches/Cog/platforms/RiscOS/vm/osExports.c 2014-11-13 22:36:48 UTC (rev 3131) +++ branches/Cog/platforms/RiscOS/vm/osExports.c 2014-11-14 03:43:01 UTC (rev 3132) @@ -28,7 +28,7 @@ #include <stdio.h> /* duh ... this is ugly */ #define XFN(export) {"", #export, (void*)export}, -#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export} +#define XFND(export,depth) {"", #export "\000" depth, (void*)export}, extern void setSocketPollFunction(int spf ); void *os_exports[][3] = { XFN(setSocketPollFunction) Modified: branches/Cog/platforms/unix/vm/osExports.c =================================================================== --- branches/Cog/platforms/unix/vm/osExports.c 2014-11-13 22:36:48 UTC (rev 3131) +++ branches/Cog/platforms/unix/vm/osExports.c 2014-11-14 03:43:01 UTC (rev 3132) @@ -1,5 +1,5 @@ #define XFN(export) {"", #export, (void*)export}, -#define XFN2(plugin, export) {#plugin, #export, (void*)plugin##_##export}, +#define XFND(export,depth) {"", #export "\000" depth, (void*)export}, char * GetAttributeString(int id); #if !defined(HEADLESS) @@ -18,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) + XFND(primitivePluginBrowserReady,"\377") + XFND(primitivePluginRequestURLStream,"\001") + XFND(primitivePluginRequestURL,"\001") + XFND(primitivePluginPostURL,"\001") + XFND(primitivePluginRequestFileHandle,"\000") + XFND(primitivePluginDestroyRequest,"\000") + XFND(primitivePluginRequestState,"\000") + XFN(ioGetDisplay) + XFN(ioGetWindow) #endif { 0, 0, 0 } }; Modified: branches/Cog/platforms/win32/vm/sqWin32Exports.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Exports.c 2014-11-13 22:36:48 UTC (rev 3131) +++ branches/Cog/platforms/win32/vm/sqWin32Exports.c 2014-11-14 03:43:01 UTC (rev 3132) @@ -22,27 +22,30 @@ extern void* preMessageHook; extern int fUseOpenGL; +#define XFN(export) {"", #export, (void*)export}, +#define XFND(export,depth) {"", #export "\000" depth, (void*)export}, +#define XVAR(export) {"", #export, &export}, + void *os_exports[][3] = { - {"","GetAttributeString", GetAttributeString}, + XFN(GetAttributeString) #if !NewspeakVM - {"","win32JoystickDebugInfo", win32JoystickDebugInfo}, - {"","win32JoystickDebugPrintRawValues", win32JoystickDebugPrintRawValues}, - {"","win32JoystickDebugPrintAlternativeValues", win32JoystickDebugPrintAlternativeValues}, + XFN(win32JoystickDebugInfo) + XFN(win32JoystickDebugPrintRawValues) + XFN(win32JoystickDebugPrintAlternativeValues) #endif - {"","win32DebugPrintSocketState", win32DebugPrintSocketState}, - {"","primitivePluginBrowserReady", primitivePluginBrowserReady}, - {"","primitivePluginRequestURLStream", primitivePluginRequestURLStream}, - {"","primitivePluginRequestURL", primitivePluginRequestURL}, - {"","primitivePluginPostURL", primitivePluginPostURL}, - {"","primitivePluginRequestFileHandle", primitivePluginRequestFileHandle}, - {"","primitivePluginDestroyRequest", primitivePluginDestroyRequest}, - {"","primitivePluginRequestState", primitivePluginRequestState}, - {"","primitiveDnsInfo", primitiveDnsInfo}, - {"","printf", printf}, - {"","stWindow", &stWindow}, - {"","firstMessageHook", &firstMessageHook}, - {"","preMessageHook", &preMessageHook}, - {"","fUseOpenGL", &fUseOpenGL}, - {NULL,NULL, NULL} + XFN(win32DebugPrintSocketState) + XFND(primitivePluginBrowserReady,"\377") + XFND(primitivePluginRequestURLStream,"\001") + XFND(primitivePluginRequestURL,"\001") + XFND(primitivePluginPostURL,"\001") + XFND(primitivePluginRequestFileHandle,"\000") + XFND(primitivePluginDestroyRequest,"\000") + XFND(primitivePluginRequestState,"\000") + XFND(primitiveDnsInfo,"\377") + XFN(printf) + XVAR(stWindow) + XVAR(firstMessageHook) + XVAR(preMessageHook) + XVAR(fUseOpenGL) + {NULL,NULL, NULL} }; - Added: branches/Cog/scripts/svntouch =================================================================== --- branches/Cog/scripts/svntouch (rev 0) +++ branches/Cog/scripts/svntouch 2014-11-14 03:43:01 UTC (rev 3132) @@ -0,0 +1,11 @@ +#!/bin/sh +# Touch file(s) or all modified files in a directory back to the checkin date +for f in "$@" +do + if [ -d "$f" ]; then + $0 "$f"/* + else + changed="`svn info \"$f\" | grep 'Last Changed Date:' | sed 's/ *(.*//'`" + test -n "$changed" && touch -t "`date -j -f 'Last Changed Date: %Y-%m-%d %H:%M:%S %z' \"$changed\" '+%Y%m%d%H%M.%S'`" "$f" + fi +done Property changes on: branches/Cog/scripts/svntouch ___________________________________________________________________ Added: svn:executable + *

1 0

VM Maker: VMMaker.oscog-eem.928.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.928.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.928 Author: eem Time: 13 November 2014, 4:46:27.418 pm UUID: b54d1270-d8e4-42a0-b861-481cd83ac1a3 Ancestors: VMMaker.oscog-eem.927 Mark expandDereferenceInterpreterProxyFunctionTable as doNotGenerate and fix its comment. =============== Diff against VMMaker.oscog-eem.927 =============== Item was changed: ----- Method: InterpreterPlugin>>expandDereferenceInterpreterProxyFunctionTable (in category 'initialize') ----- expandDereferenceInterpreterProxyFunctionTable + "This is a dummy function that the VMPluginCodeGenerator expands into a + sequence of assignments from interpreterProxy funcitons to local function pointers." + <doNotGenerate>! - "This is a dummy funciton that the VMPluginCodeGenerator expands into a - sequence of assignments from interpreterProxy funcitons to local function pointers."!

1 0

VM Maker: VMMaker.oscog-eem.927.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.927.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.927 Author: eem Time: 13 November 2014, 4:21:52.552 pm UUID: 1d35bd51-8903-4f30-b934-cbf44b739956 Ancestors: VMMaker.oscog-eem.926 Fix slip in Newspeak plugin list, AioPlugin = UnixAioPlugin. Add check to validation. =============== Diff against VMMaker.oscog-eem.926 =============== Item was changed: ----- Method: CrossPlatformVMMaker>>validatePlugin:in: (in category 'generate sources') ----- validatePlugin: plName in: listOfPlugins "Check that the class for the plugin exists, and answer that class. No longer check that if the plugin requires platform files that at least one platform subdirectory exists, not producing the source is not helpful." | plugin | plName isString ifTrue: [(listOfPlugins includes: plName) ifTrue: [plugin := Smalltalk classNamed: plName]] ifFalse: [((plName isBehavior and: [plName inheritsFrom: InterpreterPlugin]) and: [listOfPlugins includes: plName name]) ifTrue: [plugin := plName]]. plugin ifNil: [^ self couldNotFindPluginClass: plName]. + plugin shouldBeTranslated ifFalse: + [self error: 'untranslateable plugin class ', plName]. ^plugin! Item was changed: ----- Method: VMMaker class>>generateNewspeakCogVM (in category 'configurations') ----- generateNewspeakCogVM ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit with: #( NewspeakVM true MULTIPLEBYTECODESETS true) to: (FileDirectory default pathFromURI: self sourceTree, '/nscogsrc') platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') + including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation + DeflatePlugin DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin + ImmX11Plugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin + Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin + SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin + UUIDPlugin UnixOSProcessPlugin UnixAioPlugin + VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! - including:#( AioPlugin AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DeflatePlugin DSAPlugin DropPlugin - FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin ImmX11Plugin JPEGReadWriter2Plugin - JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin - RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin - UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)!

1 0

VM Maker: VMMaker.oscog-eem.926.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.926.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.926 Author: eem Time: 13 November 2014, 3:52:55.604 pm UUID: 9c0b0c9e-ba3b-4f54-bdf1-d9c1c18af828 Ancestors: VMMaker.oscog-eem.925 Make buildCaseStmt:in: look for code in all the right places =============== Diff against VMMaker.oscog-eem.925 =============== Item was changed: ----- Method: TMethod>>buildCaseStmt:in: (in category 'transformations') ----- buildCaseStmt: aSendNode in: aCodeGen "Build a case statement node for the given send of dispatchOn:in:." "Note: the first argument is the variable to be dispatched on. The second argument is a constant node holding an array of unary selectors, which will be turned into sends to self." | unimplemented errorMessage | + (aSendNode args size >= 2 + and: [aSendNode args second isConstant + and: [aSendNode args second value isArray]]) ifFalse: - ((aSendNode args size >= 2) and: - [aSendNode args second isConstant and: - [aSendNode args second value class = Array]]) ifFalse: [self error: 'wrong node structure for a case statement']. + unimplemented := aSendNode args second value select: [:s| (aCodeGen methodNamed: s) isNil]. - unimplemented := aSendNode args second value reject: [:s| self definingClass includesSelector: s]. unimplemented isEmpty ifFalse: [errorMessage := 'The following selectors in case statement "', (aSendNode printString copyUpTo: $#), '..." are unimplemented: ', (String streamContents: [:s| unimplemented do: [:sel| s crtab; store: sel]]). aCodeGen logger nextPutAll: errorMessage; cr; flush. (self confirm: errorMessage orCancel: aCodeGen abortBlock) ifFalse: [self halt]]. ^TCaseStmtNode new setExpression: aSendNode args first selectors: aSendNode args second value arguments: (aSendNode args copyFrom: 3 to: aSendNode args size)!

1 0

VM Maker: VMMaker.oscog-eem.925.mcz
by commits＠source.squeak.org 14 Nov '14

14 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.925.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.925 Author: eem Time: 13 November 2014, 3:26:35.888 pm UUID: 78aa3501-bb68-484a-967e-8315ecc0165d Ancestors: VMMaker.oscog-eem.924 Fix recursive def of ObjectMemory>>wordSize and comment the relevant implementations. =============== Diff against VMMaker.oscog-eem.924 =============== Item was removed: - ----- Method: NewCoObjectMemorySimulator>>wordSize (in category 'memory access') ----- - wordSize - ^4! Item was removed: - ----- Method: NewObjectMemorySimulator>>wordSize (in category 'memory access') ----- - wordSize - ^4! Item was changed: ----- Method: ObjectMemory>>wordSize (in category 'interpreter access') ----- wordSize + "Answer the manager's word size, which is assumed to be equivalent to the underlying machine's word size." + ^4! - "Answer the width of an object pointer, in bytes." - - ^self wordSize! Item was changed: ----- Method: Spur32BitMemoryManager class>>wordSize (in category 'word size') ----- wordSize + "Answer the manager's word size, which is the size of an oop, and which + is assumed to be equivalent to the underlying machine's word size." ^4! Item was changed: ----- Method: Spur32BitMemoryManager>>wordSize (in category 'word size') ----- wordSize + "Answer the manager's word size, which is the size of an oop, and which + is assumed to be equivalent to the underlying machine's word size." <api> <cmacro: '() 4'> ^4! Item was changed: ----- Method: Spur64BitMemoryManager class>>wordSize (in category 'word size') ----- wordSize + "Answer the manager's word size, which is the size of an oop, and which + is assumed to be equivalent to the underlying machine's word size." ^8! Item was changed: ----- Method: Spur64BitMemoryManager>>wordSize (in category 'word size') ----- wordSize + "Answer the manager's word size, which is the size of an oop, and which + is assumed to be equivalent to the underlying machine's word size." <cmacro: '() 8'> ^8! Item was changed: ----- Method: SpurMemoryManager class>>wordSize (in category 'word size') ----- wordSize + "Answer the manager's word size, which is the size of an oop, and which + is assumed to be equivalent to the underlying machine's word size." ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>wordSize (in category 'word size') ----- wordSize + "Answer the manager's word size, which is the size of an oop, and which + is assumed to be equivalent to the underlying machine's word size." - "Answer the manager's word size, whjich is the size of an oop, and which - is assumed to be equivslent to the underlying machine's word size." ^self subclassResponsibility!

1 0

← Newer
1
...
9
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2014