Vm-dev November 2019

vm-dev@lists.squeakfoundation.org

19 participants
178 discussions

[OpenSmalltalk/opensmalltalk-vm] 81cb7e: Cog Processor Simulator Plugins as per Cog-eem.369...
by Eliot Miranda 22 Nov '19

22 Nov '19

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 81cb7e9083cdb053d1ee8ee77fee9618ce0e88d2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/81cb7e9083cdb053d1… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2019-11-22 (Fri, 22 Nov 2019) Changed paths: M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/GdbARMv8Plugin/GdbARMv8Plugin.c Log Message: ----------- Cog Processor Simulator Plugins as per Cog-eem.369/VMMaker.oscog-eem.2589 Speed up marshalling for the ProcessorSimulatorPlugins by using SmallInteger for the memory range arguments instead of Unsigned. Using the latest Slang changes this inlines a lot of code and reduces function calls to decode the range arguments. Given that the memory range arguments are always within the range of the memory byte array, SmallIntegers provide more than enough range. More substantively use primitiveFailForOSError: to answer the failure error code, if any, on simulating. Slang for plugins. Fix resultSendAlwaysFails: to include the two new failure sends, primitiveFailForFFIException:at: primitiveFailForOSError:. As a micro optimization, if the enclosing method has type #sqInt then return the falures directly, as they're all typed as sqInt. Should save an instruction :-) Generate more efficient code for dereferencing SmallInteger type parameters in SmartSyntaxPlugins. Avoid a stack variable access by assigning to the target variable in the validation expression, and referring to the variable in the conversion expression, e.g. instead of sqInt v; if (!(isIntegerObject(stackValue(0)))) return primitiveFailFor(PrimErrBadArgument); v = stackIntegerValue(0); generate sqInt v; if (!(isIntegerObject(v = stackValue(0)))) return primitiveFailFor(PrimErrBadArgument); v = integerValueOf(v); Allow the Cog ProcessorSimulationPlugins to use the inlined macro definitions for isIntegerObject:, integerObjectOf: & integerValueOf: even though they're external plugins (since in single steppng, marshalling performance is at a premium). Commit: 7c2325bcb858e52e19296a4f0a8092c1d4f5d54e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7c2325bcb858e52e19… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2019-11-22 (Fri, 22 Nov 2019) Changed paths: M src/plugins/BitBltPlugin/BitBltPlugin.c Log Message: ----------- Merge Nicolas' BitBltPlugin work with my ProessorSimulatorPlugin work. Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/c812fbc619c2...7c…

1 0

VM Maker: VMMaker.oscog-eem.2589.mcz
by commits＠source.squeak.org 22 Nov '19

22 Nov '19

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2589.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2589 Author: eem Time: 22 November 2019, 1:20:45.793955 pm UUID: 5beddd90-a4e7-4e3d-95de-550f911e96b4 Ancestors: VMMaker.oscog-eem.2588 Slang for plugins. Fix resultSendAlwaysFails: to include the two new failure sends, primitiveFailForFFIException:at: primitiveFailForOSError:. As a micro optimization, if the enclosing method has type #sqInt then return the falures directly, as they're all typed as sqInt. That should save an instruction :-) =============== Diff against VMMaker.oscog-eem.2588 =============== Item was changed: ----- Method: SmartSyntaxPluginTMethod>>fixUpReturnOneStmt:on: (in category 'transforming') ----- fixUpReturnOneStmt: stmt on: sStream | expr exprRetStmts "p t" | stmt isReturn ifFalse: [^sStream nextPut: stmt]. expr := stmt expression. (expr isSend and: [self resultSendAlwaysFails: expr]) ifTrue: ["failure returns" + returnType = #sqInt + ifTrue: [sStream nextPut: (TReturnNode new setExpression: expr)] + ifFalse: [sStream nextPut: expr; nextPut: self nullReturnExpr]. - sStream nextPut: expr; nextPut: self nullReturnExpr. ^nil]. (expr isVariable and: ['nil' = expr name]) ifTrue: ["^ nil -- this is never right unless automatically generated" sStream nextPut: stmt. ^nil]. (expr isVariable and: ['self' = expr name]) ifTrue: ["^ self" fullArgs isEmpty ifFalse: [sStream nextPut: (self statementGuardedWithSuccess: (self popExpr: fullArgs size))]. sStream nextPut: self nullReturnExpr. ^nil]. (expr isVariable or: [expr isConstant]) ifTrue: ["^ variable or ^ constant without guardchecking" sStream nextPut: (sStream isEmpty "No statements to cause failure, therefore no need for failure guard." ifTrue: [self pop: fullArgs size + 1 thenReturnExpr: expr] ifFalse: [self statementGuardedWithSuccess: (self pop: fullArgs size + 1 thenReturnExpr: expr)]); nextPut: self nullReturnExpr. ^nil]. "^ expr with necessary guard checking" "p := sStream position." exprRetStmts := Array streamContents: [:ersStream| (self resultExpressionCanFail: expr) ifTrue: ["t := 1." ersStream nextPut: (self assign: (self oopVariable: '_return_value') expression: expr); nextPut: (self statementGuardedWithSuccess: (self pop: fullArgs size + 1 thenReturnExpr: (self oopVariable: '_return_value')))] ifFalse: ["t := 2." ersStream nextPut: (self pop: fullArgs size + 1 thenReturnExpr: expr)]]. sStream isEmpty "No statements to cause failure, therefore no need for an initial failure guard." ifTrue: [sStream nextPutAll: exprRetStmts] ifFalse: ["t := t + 2." sStream nextPut: (self statementGuardedWithSuccess: exprRetStmts)]. sStream nextPut: self nullReturnExpr. "Them := Dictionary new" "(Them at: t ifAbsentPut: [Dictionary new]) at: self selector put: (sStream originalContents copyFrom: p + 1 to: sStream position)"! Item was changed: ----- Method: SmartSyntaxPluginTMethod>>resultSendAlwaysFails: (in category 'private') ----- resultSendAlwaysFails: aTSendNode + ^(#(primitiveFail primitiveFailFor: primitiveFailForFFIException:at: primitiveFailForOSError:) includes: aTSendNode selector) - ^(#(primitiveFail primitiveFailFor:) includes: aTSendNode selector) or: [aTSendNode selector == #success: and: [aTSendNode args first isConstant and: [aTSendNode args first value == false]]]!

1 0

VM Maker: Cog-eem.369.mcz
by commits＠source.squeak.org 22 Nov '19

22 Nov '19

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.369.mcz ==================== Summary ==================== Name: Cog-eem.369 Author: eem Time: 22 November 2019, 1:03:06.271882 pm UUID: f98a0c3b-0dbe-42ae-8210-d628f7f84b98 Ancestors: Cog-eem.368 Speed up marshalling for the ProcessorSimulatorPlugins by using SmallInteger for the memory range arguments instead of Unsigned. Using the latest Slang changes this inlines a lot of code and reduces function calls to decode the range arguments. Given that the memory range arguments are always within the range of the memory byte array, SmallIntegers provide more than enough range. More substantively use primitiveFailForOSError: to answer the failure error code, if any, on simulating. =============== Diff against Cog-eem.368 =============== Item was added: + ----- Method: ProcessorSimulatorPlugin class>>preambleCCode (in category 'translation') ----- + preambleCCode + "Whoreish SmallInteger acess macros to speed up marshalling." + ^String streamContents: [:s| self codeGeneratorClass new preDeclareMacrosForFastClassCheckingOn: s guardWith: nil]! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveDisassembleAt:InMemory: (in category 'primitives') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveDisassembleAt: address "<Integer>" InMemory: memory "<Bitmap|ByteArray|WordArray>" "Return an Array of the instruction length and its decompilation as a string for the instruction at address in memory." | cpuAlien cpu instrLenOrErr resultObj log logLen logObj logObjData | <var: #cpu type: #'void *'> <var: #log type: #'char *'> <var: #logLen type: #long> <var: #logObjData type: #'char *'> cpuAlien := self primitive: #primitiveDisassembleAtInMemory + parameters: #(SmallInteger WordsOrBytes) - parameters: #(Unsigned WordsOrBytes) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. instrLenOrErr := self disassembleFor: cpu At: address In: memory Size: (interpreterProxy byteSizeOf: memory cPtrAsOop). instrLenOrErr < 0 ifTrue: + [^interpreterProxy primitiveFailForOSError: instrLenOrErr negated]. - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. log := self getlog: (self cCode: [self addressOf: logLen] inSmalltalk: [logLen := 0]). resultObj := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2. resultObj = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. "Easier keeping the damn thing on the stack than using pushRemappableOop:/popRemappableOop. Where is topRemappableOop when you need it?" interpreterProxy pushRemappableOop: resultObj. logObj := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: logLen. interpreterProxy failed ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. logObjData := interpreterProxy arrayValueOf: logObj. self mem: logObjData cp: log y: logLen. resultObj := interpreterProxy popRemappableOop. interpreterProxy storePointer: 0 ofObject: resultObj withValue: (interpreterProxy integerObjectOf: instrLenOrErr). interpreterProxy storePointer: 1 ofObject: resultObj withValue: logObj. ^resultObj! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveFlushICacheFrom:To: (in category 'primitives') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveFlushICacheFrom: startAddress "<Integer>" To: endAddress "<Integer>" "Flush the icache in the requested range" | cpuAlien cpu | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveFlushICacheFromTo + parameters: #(SmallInteger SmallInteger) - parameters: #(Unsigned Unsigned) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. self flushICache: cpu From: startAddress To: endAddress! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveResetCPU (in category 'primitives') ----- primitiveResetCPU | cpuAlien cpu maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveResetCPU parameters: #() receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. maybeErr := self resetCPU: cpu. maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailForOSError: maybeErr]. - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveRunInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." | cpuAlien cpu memorySize maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveRunInMemoryMinAddressMaxAddressReadWrite + parameters: #(WordsOrBytes SmallInteger SmallInteger SmallInteger) - parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < 0 + or: [maxAddress < 0 + or: [minWriteMaxExecAddress < 0]]) ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. "Add forceStopOnInterrupt to the interrupt check chain. It is our responsibility to chain calls, hence we remember any previous client in prevInterruptCheckChain." prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: [prevInterruptCheckChain := 0]. memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. maybeErr := self runCPU: cpu In: memory Size: (memorySize min: maxAddress) MinAddressRead: minAddress Write: minWriteMaxExecAddress. interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailForOSError: maybeErr]. - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveRunInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." | cpuAlien cpu maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveRunInMemoryMinimumAddressReadWrite + parameters: #(WordsOrBytes SmallInteger SmallInteger) - parameters: #(WordsOrBytes Unsigned Unsigned) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < 0 + or: [minWriteMaxExecAddress < 0]) ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: [prevInterruptCheckChain := 0]. maybeErr := self runCPU: cpu In: memory Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) MinAddressRead: minAddress Write: minWriteMaxExecAddress. interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailForOSError: maybeErr]. - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses." | cpuAlien cpu memorySize maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite + parameters: #(WordsOrBytes SmallInteger SmallInteger SmallInteger) - parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < 0 + or: [maxAddress < 0 + or: [minWriteMaxExecAddress < 0]]) ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. maybeErr := self singleStepCPU: cpu In: memory Size: (memorySize min: maxAddress) MinAddressRead: minAddress Write: minWriteMaxExecAddress. maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailForOSError: maybeErr]. - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveSingleStepInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <BochsIA32|X86Alien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses." | cpuAlien cpu maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveSingleStepInMemoryMinimumAddressReadWrite + parameters: #(WordsOrBytes SmallInteger SmallInteger) - parameters: #(WordsOrBytes Unsigned Unsigned) receiver: #Oop. (cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + (minAddress < 0 + or: [minWriteMaxExecAddress < 0]) ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. maybeErr := self singleStepCPU: cpu In: memory Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) MinAddressRead: minAddress Write: minWriteMaxExecAddress. maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailForOSError: maybeErr]. - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. ^cpuAlien!

1 0

VM Maker: VMMaker.oscog-eem.2588.mcz
by commits＠source.squeak.org 22 Nov '19

22 Nov '19

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2588.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2588 Author: eem Time: 22 November 2019, 12:54:50.761896 pm UUID: f53bff41-2866-4ca9-a512-4665b1c5e74d Ancestors: VMMaker.oscog-nice.2587 Slang for plugins: Generaet more efficient code for dereferencing SmallInteger type parameters in SmartSyntaxPlugins. Avoid a stack variable access by assigning to the target variable in the validation expression, and referring to the variable in the conversion expression, e.g. instead of sqInt v; if (!(isIntegerObject(stackValue(0)))) return primitiveFailFor(PrimErrBadArgument); v = stackIntegerValue(0); generate sqInt v; if (!(isIntegerObject(v = stackValue(0)))) return primitiveFailFor(PrimErrBadArgument); v = integerValueOf(v); Allow the Cog ProcessorSimulationPlugins to use the inlined macro definitions for isIntegerObject:, integerObjectOf: & integerValueOf: even though they're external plugins (since in single steppng, marshalling performance is at a premium). =============== Diff against VMMaker.oscog-nice.2587 =============== Item was changed: ----- Method: SmartSyntaxPluginAssignmentCodeGenerator>>ccgLoad:expr:asIntegerValueFrom: (in category 'coercing') ----- ccgLoad: aBlock expr: aString asIntegerValueFrom: anInteger + "Assume the variable has already been assigned by SmartSyntaxPluginCodeGenerator>>ccgLoad:expr:asIntegerValueFrom:, + so merely convert it. This avoids two stack accesses." ^String streamContents: [:aStream | aStream nextPutAll: aString; + nextPutAll: ' := interpreterProxy integerValueOf: '; + nextPutAll: aString]! - nextPutAll: ' := interpreterProxy stackIntegerValue: '; - print: anInteger]! Item was changed: ----- Method: SmartSyntaxPluginValidationCodeGenerator>>ccgLoad:expr:asIntegerValueFrom: (in category 'coercing') ----- + ccgLoad: aBlock expr: variableName asIntegerValueFrom: stackIndex + "Cache the value in the variable to avoid accessing the stack more than once." + ^String streamContents: + [:aStream | + aStream + nextPutAll: 'interpreterProxy '; + nextPutAll: #isIntegerObject:; + nextPutAll: ' ('; nextPutAll: variableName; nextPutAll: ' := '; + nextPutAll: (self stackAccessorFor: stackIndex); + nextPut: $)]! - ccgLoad: aBlock expr: aString asIntegerValueFrom: stackIndex - ^self loadAs: #isIntegerObject: from: stackIndex! Item was changed: ----- Method: VMPluginCodeGenerator>>generateInterpreterProxyFunctionDereference:on:indent: (in category 'C translation') ----- generateInterpreterProxyFunctionDereference: aNode on: aStream indent: anInteger | pluginsToClone | pluginsToClone := self pluginFunctionsToClone copyWithoutAll: self selectorsThatAreGeneratedAsMacros. pluginsToClone isEmpty ifTrue: [^self]. aStream cr. self withConditionalDefineOf: 'SQUEAK_BUILTIN_PLUGIN' comment: nil on: aStream do: [pluginsToClone do: [:s| | cs | + self withGuardAgainstDefinitionOf: s on: aStream do: + [cs := self cFunctionNameFor: s. + self withOptionalVerbiageFor: s - cs := self cFunctionNameFor: s. - self withOptionalVerbiageFor: s - on: aStream - do: [aStream tab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;; cr] - ifOptionalDo: - [self - withConditionalDefineOf: cs - comment: nil on: aStream + do: [aStream tab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;; cr] + ifOptionalDo: + [self + withConditionalDefineOf: cs + comment: nil + on: aStream + do: [aStream tab: anInteger; nextPutAll: cs; nextPutAll: ' = 0;'; cr]]]]]! - do: [aStream tab: anInteger; nextPutAll: cs; nextPutAll: ' = 0;'; cr]]]]! Item was changed: ----- Method: VMPluginCodeGenerator>>preDeclareInterpreterProxyOn: (in category 'C code generator') ----- preDeclareInterpreterProxyOn: aStream "Put the necessary #defines needed before interpreterProxy. Basically internal plugins use the VM's interpreterProxy variable and external plugins use their own. Override to keep local copies of all functions in external prims, and link directly in internal plugins." "| pcc | pcc := self new. (InterpreterProxy selectors reject: [:s| #(initialize private) includes: (InterpreterProxy whichCategoryIncludesSelector: s)]) do: [:s| pcc noteUsedPluginFunction: s]. pcc preDeclareInterpreterProxyOn: Transcript. Transcript flush" | pluginFuncs | self notePluginFunctionsUsedByMacros. (pluginFuncs := self pluginFunctionsToClone) isEmpty ifTrue: [^super preDeclareInterpreterProxyOn: aStream]. (pluginFuncs includesAnyOf: self selectorsThatAreGeneratedAsMacros) ifTrue: + [self preDeclareMacrosForFastClassCheckingOn: aStream guardWith: #'SQUEAK_BUILTIN_PLUGIN']. - [self preDeclareMacrosForFastClassCheckingOn: aStream]. pluginFuncs := pluginFuncs copyWithoutAll: self selectorsThatAreGeneratedAsMacros. pluginFuncs isEmpty ifTrue: [^self]. pluginFuncs := self collectAndCheckInterpreterProxyInterfaceFor: pluginFuncs verbose: false. aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. pluginFuncs do: + [:tMethod| + self withGuardAgainstDefinitionOf: tMethod selector on: aStream do: + [| functionName | + functionName := self cFunctionNameFor: tMethod selector. + aStream nextPutAll: + ((String streamContents: + [:s| + tMethod + static: true; + emitCFunctionPrototype: s generator: self]) + copyReplaceAll: functionName + with: '(*', functionName, ')' + tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]])]]. - [:tMethod| | functionName | - functionName := self cFunctionNameFor: tMethod selector. - aStream nextPutAll: - ((String streamContents: - [:s| - tMethod - static: true; - emitCFunctionPrototype: s generator: self]) - copyReplaceAll: functionName - with: '(*', functionName, ')' - tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]])]. aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'; cr. pluginFuncs do: [:tMethod| self withGuardAgainstDefinitionOf: tMethod selector on: aStream do: [self withOptionalVerbiageFor: tMethod selector on: aStream do: [tMethod static: false; export: false; emitCFunctionPrototype: aStream generator: self] ifOptionalDo: [aStream nextPutAll: '# define '. (TSendNode new setSelector: tMethod selector receiver: (TVariableNode new setName: 'interpreterProxy') arguments: (tMethod args collect: [:a| TVariableNode new setName: a])) emitCCodeAsArgumentOn: aStream level: 0 generator: self. aStream nextPutAll: ' 0'; cr]]]. aStream nextPutAll: 'extern'; cr; nextPutAll: '#endif'; cr! Item was removed: - ----- Method: VMPluginCodeGenerator>>preDeclareMacrosForFastClassCheckingOn: (in category 'C code generator') ----- - preDeclareMacrosForFastClassCheckingOn: aStream - "These macros can be used to check for various cases of Integer types. - Since they can be defined based on existing API, this is a good trade off: - - avoid extending the interpreterProxy API unnecessarily - - provide fast type checking" - - "Speed-up generated code for internal plugins by using macros and fixed class indices to define this well known functionality." - #( '#if defined(SQUEAK_BUILTIN_PLUGIN)' cr - - '# define isIntegerObject(oop) ((oop) & 1)' cr - - '# if SPURVM' - 'extern sqInt classIndexOf(sqInt);' - "Compact class indices are hardcoded here because there is no guarantee that the pool values at generation time - are that of SPUR.. Make sure they are in sync with SpurMemoryManager class>>initializeCompactClassIndices" - '# define LargeNegativeIntegerClassIndex 32' - '# define LargePositiveIntegerClassIndex 33' - '# if BytesPerOop == 4' - '# define isImmediate(oop) ((oop) & 3)' - '# else' - '# define isImmediate(oop) ((oop) & 7)' - '# endif' - '# define isKindOfInteger(oop) (isImmediate(oop) ? isIntegerObject(oop) : (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' - '# define isLargeIntegerObject(oop) (!!isImmediate(oop) && (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' - '# define isLargeNegativeIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargeNegativeIntegerClassIndex)' - '# define isLargePositiveIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargePositiveIntegerClassIndex)' - '# endif /* SPURVM */' - '#endif /* defined(SQUEAK_BUILTIN_PLUGIN) */' cr - - "If the functionality has not been defined via macros, define default versions using existing plugin API" - '#if !!defined(isKindOfInteger)' - '# define isLargeNegativeIntegerObject(oop) (fetchClassOf(oop) == classLargeNegativeInteger())' - '# define isLargePositiveIntegerObject(oop) (fetchClassOf(oop) == classLargePositiveInteger())' - '# define isLargeIntegerObject(oop) (isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))' - '# define isKindOfInteger(oop) (isIntegerObject(oop) || isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))' - '#endif' cr) do: - [:element| - aStream cr. - element ~~ #cr ifTrue: [aStream nextPutAll: element]]! Item was added: + ----- Method: VMPluginCodeGenerator>>preDeclareMacrosForFastClassCheckingOn:guardWith: (in category 'C code generator') ----- + preDeclareMacrosForFastClassCheckingOn: aStream guardWith: guardMacroOrNil + "These macros can be used to check for various cases of Integer types. + Since they can be defined based on existing API, this is a good trade off: + - avoid extending the interpreterProxy API unnecessarily + - provide fast type checking" + + "Speed-up generated code for internal plugins by using macros and fixed class indices to define this well known functionality." + (guardMacroOrNil ifNotNil: [{'#if defined(', guardMacroOrNil, ')'. #cr}] ifNil: [#()]), + #( '# define isIntegerObject(oop) ((oop) & 1)' + '# define integerObjectOf(oop) (((oop) << NumSmallIntegerTagBits) | 1)' + '# define integerValueOf(oop) ((oop) >> NumSmallIntegerTagBits)' cr + + '# if SPURVM' + 'extern sqInt classIndexOf(sqInt);' + "Compact class indices are hardcoded here because there is no guarantee that the pool values at generation time + are that of SPUR.. Make sure they are in sync with SpurMemoryManager class>>initializeCompactClassIndices" + '# define LargeNegativeIntegerClassIndex 32' + '# define LargePositiveIntegerClassIndex 33' + '# if BytesPerOop == 4' + '# define isImmediate(oop) ((oop) & 3)' + '# else' + '# define isImmediate(oop) ((oop) & 7)' + '# endif' + '# define isKindOfInteger(oop) (isImmediate(oop) ? isIntegerObject(oop) : (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' + '# define isLargeIntegerObject(oop) (!!isImmediate(oop) && (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' + '# define isLargeNegativeIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargeNegativeIntegerClassIndex)' + '# define isLargePositiveIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargePositiveIntegerClassIndex)' + '# endif /* SPURVM */'), + (guardMacroOrNil ifNotNil: [{'#endif /* defined(', guardMacroOrNil, ') */'}] ifNil: [#()]), + + "If the functionality has not been defined via macros, define default versions using existing plugin API" + #( cr + '#if !!defined(isKindOfInteger)' + '# define isLargeNegativeIntegerObject(oop) (fetchClassOf(oop) == classLargeNegativeInteger())' + '# define isLargePositiveIntegerObject(oop) (fetchClassOf(oop) == classLargePositiveInteger())' + '# define isLargeIntegerObject(oop) (isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))' + '# define isKindOfInteger(oop) (isIntegerObject(oop) || isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))' + '#endif' cr) do: + [:element| + aStream cr. + element ~~ #cr ifTrue: [aStream nextPutAll: element]]! Item was changed: ----- Method: VMPluginCodeGenerator>>selectorsThatMayBeGeneratedAsMacros (in category 'public') ----- selectorsThatMayBeGeneratedAsMacros "Answer a list of selectors that maybe generated as a C macro rather than as an interpreterProxy function call." + ^self selectorsThatAreGeneratedAsMacros, #(isIntegerObject: integerValueOf: integerObjectOf: isImmediate:)! - ^self selectorsThatAreGeneratedAsMacros, #(isIntegerObject: isImmediate:)!

1 0

[OpenSmalltalk/opensmalltalk-vm] 32-bit libB3DAcceleratorPlugin.dylib fails to link; 32-bit Squeak B3DAcceleratorPlugin links against metal. (#385)
by Eliot Miranda 22 Nov '19

22 Nov '19

Seems to be something strange with the B3DAcceleratorPlugin on 32-bit macos. The pharo libB3DAcceleratorPlugin.dylib fails to link missing: createOpenGLTextureLayerHandle destroyOpenGLTextureLayerHandle getMainWindowOpenGLContext setOpenGLTextureLayerContent The Squeak one links, but apparently against Metal, which isn't going to work since Metal is 64-bit only (or so I've been told). -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/385

2 2

[OpenSmalltalk/opensmalltalk-vm] Image buffer corruption when running build.macos64x64 targets (#392)
by Gene Ragan 22 Nov '19

22 Nov '19

Building from the latest sources on the Cog branch, I see the attached image when loading various images using various OSX builds. I have tried the 64-bit Pharo, Squeak and newspeak builds with their associated images. I see some variation of the attached image below. If I rollback the source to the 201901172323 tag, I am able to build and load an image and see the window as expected. <img width="811" alt="Screen Shot 2019-04-23 at 6 47 51 PM" src="https://user-images.githubusercontent.com/32800969/56627814-3fea6280-65fc-1…"> -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/392

3 4

[OpenSmalltalk/opensmalltalk-vm]
by Nicolas Cellier 22 Nov '19

22 Nov '19

Branch: refs/heads/fix_BitBlt_Issue_447 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm

1 0

[OpenSmalltalk/opensmalltalk-vm] Attempt to Fix Issue #447 - BitBlt signed int overflow (#448)
by Nicolas Cellier 22 Nov '19

22 Nov '19

Generate the plugin from VMMaker.oscog-nice.2587 which declare `dx dy sx sy` as sqInt rather than int. I checked that this fixed the snippet given in issue #447. You can view, comment on, or merge this pull request online at: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/448 -- Commit Summary -- * Attempt to Fix Issue #447 - BitBlt signed int overflow -- File Changes -- M src/plugins/BitBltPlugin/BitBltPlugin.c (64) -- Patch Links -- https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/448.patch https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/448.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/448

1 1

[OpenSmalltalk/opensmalltalk-vm] 7225ae: Attempt to Fix Issue #447 - BitBlt signed int over...
by Nicolas Cellier 22 Nov '19

22 Nov '19

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 7225aecbb30015cd60b2fd8a4520726c343381e8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7225aecbb30015cd60… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2019-11-21 (Thu, 21 Nov 2019) Changed paths: M src/plugins/BitBltPlugin/BitBltPlugin.c Log Message: ----------- Attempt to Fix Issue #447 - BitBlt signed int overflow Generate the plugin from VMMaker.oscog-nice.2587 which declare `dx dy sx sy` as sqInt rather than int. Commit: c812fbc619c2dd95419a9019b48148afd7942ed5 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c812fbc619c2dd9541… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2019-11-22 (Fri, 22 Nov 2019) Changed paths: M src/plugins/BitBltPlugin/BitBltPlugin.c Log Message: ----------- Merge pull request #448 from OpenSmalltalk/fix_BitBlt_Issue_447 Attempt to Fix Issue #447 - BitBlt signed int overflow Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/9320a52ef11f...c8…

1 0

Failed: OpenSmalltalk/opensmalltalk-vm#1857 (fix_BitBlt_Issue_447 - 7225aec)
by Travis CI 22 Nov '19

22 Nov '19

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #1857 Status: Failed Duration: 51 mins and 40 secs Commit: 7225aec (fix_BitBlt_Issue_447) Author: Nicolas Cellier Message: Attempt to Fix Issue #447 - BitBlt signed int overflow Generate the plugin from VMMaker.oscog-nice.2587 which declare `dx dy sx sy` as sqInt rather than int. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7225aecbb300 View the full build log and details: https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/615299879?utm_m… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
18
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 2019