[Vm-dev] VM Maker: VMMakerJS-bf.7.mcz
commits at source.squeak.org
commits at source.squeak.org
Fri Oct 10 13:46:33 UTC 2014
Bert Freudenberg uploaded a new version of VMMakerJS to project VM Maker:
http://source.squeak.org/VMMaker/VMMakerJS-bf.7.mcz
==================== Summary ====================
Name: VMMakerJS-bf.7
Author: bf
Time: 7 October 2014, 1:31:20.867 am
UUID: fe6d3bdb-9095-4ac4-8218-3c47f1fd9805
Ancestors: VMMakerJS-bf.6
Make ScratchPlugin work.
=============== Diff against VMMakerJS-bf.6 ===============
Item was changed:
----- Method: JSCodeGenerator>>generateCCoercion:on:indent: (in category 'JS translation') -----
generateCCoercion: msgNode on: aStream indent: level
"Generate the JS code for this message onto the given stream."
| expr cType |.
expr := msgNode args first.
cType := msgNode args second value.
(expr isSend and: [expr receiver name = 'interpreterProxy' and: [expr selector = #firstIndexableField:]]) ifTrue: [
cType := msgNode args second value.
self emitJSExpression: expr args first on: aStream.
cType = 'unsigned char *' ifTrue: [^aStream nextPutAll: '.bytes'].
+ cType = 'unsigned int *' ifTrue: [^aStream nextPutAll: '.words'].
cType = 'int *' ifTrue: [^aStream nextPutAll: '.wordsAsInt32Array()'].
+ cType = 'short *' ifTrue: [^aStream nextPutAll: '.wordsAsInt16Array()'].
cType = 'float *' ifTrue: [^aStream nextPutAll: '.wordsAsFloat32Array()'].
+ cType = 'double *' ifTrue: [^aStream nextPutAll: '.wordsAsFloat64Array()'].
self halt.
] ifFalse: [
((#('double' 'float') includes: cType) or: ['sqInt (*)(*)'match: cType])
ifFalse: [self halt].
self emitJSExpression: expr on: aStream.
]
!
Item was added:
+ ----- Method: JSCodeGenerator>>generateCos:on:indent: (in category 'JS translation') -----
+ generateCos: msgNode on: aStream indent: level
+ "Generate the JS code for the message onto the given stream."
+
+ aStream nextPutAll: 'Math.cos('.
+ self emitJSExpression: msgNode receiver on: aStream.
+ aStream nextPutAll: ')'.
+ !
Item was changed:
----- Method: JSCodeGenerator>>generateDivide:on:indent: (in category 'JS translation') -----
generateDivide: msgNode on: aStream indent: level
"Generate the JS code for this message onto the given stream."
| rcvr arg divisor |
rcvr := msgNode receiver.
arg := msgNode args first.
+ (msgNode selector == #/ and: [self pluginName = 'ScratchPlugin']) ifTrue: [
+ self emitJSExpression: rcvr on: aStream.
+ aStream nextPutAll: ' / '.
+ ^self emitJSExpression: arg on: aStream].
(arg isConstant and:
[UseRightShiftForDivide and:
[(divisor := arg value) isInteger and:
[divisor isPowerOfTwo and:
[divisor > 0 and:
[divisor <= (1 bitShift: 31)]]]]])
ifTrue: [
"use signed (arithmetic) right shift instead of divide"
self emitJSExpression: rcvr on: aStream.
aStream nextPutAll: ' >> ', (divisor log: 2) asInteger printString.
] ifFalse: [
"use float divide and coerce to integer"
aStream nextPutAll: 'DIV('.
self emitJSExpression: rcvr on: aStream.
aStream nextPutAll: ', '.
self emitJSExpression: arg on: aStream.
aStream nextPutAll: ')'.
].
!
Item was added:
+ ----- Method: JSCodeGenerator>>generateSin:on:indent: (in category 'JS translation') -----
+ generateSin: msgNode on: aStream indent: level
+ "Generate the JS code for the message onto the given stream."
+
+ aStream nextPutAll: 'Math.sin('.
+ self emitJSExpression: msgNode receiver on: aStream.
+ aStream nextPutAll: ')'.
+ !
Item was added:
+ ----- Method: JSCodeGenerator>>generateSqrt:on:indent: (in category 'JS translation') -----
+ generateSqrt: msgNode on: aStream indent: level
+ "Generate the JS code for the message onto the given stream."
+
+ aStream nextPutAll: 'Math.sqrt('.
+ self emitJSExpression: msgNode receiver on: aStream.
+ aStream nextPutAll: ')'.
+ !
Item was changed:
----- Method: JSCodeGenerator>>ignoredMethods (in category 'public') -----
ignoredMethods
+ ^#()!
- ^#(dstLongAt: dstLongAt:put: srcLongAt:)!
Item was changed:
----- Method: JSCodeGenerator>>initializeCTranslationDictionary (in category 'JS 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:
#abs #generateAbs:on:indent:
+ #sqrt #generateSqrt:on:indent:
+ #sin #generateSin:on:indent:
+ #cos #generateCos: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:
#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:
#preprocessorExpression: #generateInlineCppDirective:on:indent:
#isDefined:inSmalltalk:comment:ifTrue: #generateInlineCppIfDef:on:indent:
#isDefined:inSmalltalk:comment:ifTrue:ifFalse: #generateInlineCppIfDefElse:on:indent:
#isDefinedTrueExpression:inSmalltalk:comment:ifTrue:ifFalse: #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:
#asSymbol #generateAsSymbol: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:
#shouldNotImplement #generateSmalltalkMetaError:on:indent:
#shouldBeImplemented #generateSmalltalkMetaError:on:indent:
"optimized interpreterProxy calls"
#firstIndexableField: #generateFirstIndexableField:on:indent:
#slotSizeOf: #generateSlotSizeOf:on:indent:
#stSizeOf: #generateSlotSizeOf:on:indent:
#byteSizeOfBytes: #generateByteSizeOf:on:indent:
#byteSizeOf: #generateByteSizeOf:on:indent:
#fetchClassOf: #generateFetchClassOf:on:indent:
#superclassOf: #generateSuperclassOf:on:indent:
#instanceSizeOf: #generateInstanceSizeOf:on:indent:
#is:KindOf: #generateIsKindOf:on:indent:
#isFloatObject: #generateIsFloatObject:on:indent:
#isWordsOrBytes: #generateIsWordsOrBytes:on:indent:
#cDigitCopyFrom:to:len: #generateCDigitCopy:on:indent:
#sizeOfSTArrayFromCPrimitive: #generateSizeOfSTArrayFromCPrimitive:on:indent:
#asciiValue #generateIdentityUnary:on:indent:
#primitiveFail #generateInterpreterProxyCall:on:indent:
#intAtPointer: #generateIntAtPointer:on:indent:
#byteAtPointer: #generateByteAtPointer:on:indent:
#oopForPointer: #generateOopForPointer:on:indent:
#long32At: #generateLong32At:on:indent:
#srcLongAt: #generateSrcLongAt:on:indent:
#dstLongAt: #generateDstLongAt:on:indent:
#dstLongAt:put: #generateDstLongAtPut: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:
#cCode: #generateInlineCCodeAsArgument:on:indent:
#cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent:
).
asArgumentTranslationDict := Dictionary new: 8.
1 to: pairs size by: 2 do: [:i |
asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)].
cCodeTranslationDict := Dictionary new: 8.
pairs := #(
'fprintf(stderr, "\n%s: %s", moduleName, s)' 'console.log(moduleName + ": " + s)'
'interpreterProxy->majorVersion() == VM_PROXY_MAJOR' 'interpreterProxy.majorVersion() == VM_PROXY_MAJOR'
'interpreterProxy->minorVersion() >= VM_PROXY_MINOR' 'interpreterProxy.minorVersion() >= VM_PROXY_MINOR'
'sqrt(result)' 'Math.sqrt(result)'
'sqrt(len)' 'Math.sqrt(len)'
+ 'atan2(dy,dx)' 'Math.atan2(dy, dx)'
+ 'rand()' 'Math.random()'
+ '*src++' 'src[_src++]'
+ '*dst++ = max' 'dst[_dst++] = max'
+ 'src++' '_src++'
+ '*dst++ = *src; src += 2' 'dst[_dst++] = src[_src]; _src += 2'
+
).
1 to: pairs size by: 2 do: [:i |
cCodeTranslationDict at: (pairs at: i) put: (pairs at: i + 1)].
!
Item was changed:
----- Method: JSCodeGenerator>>returnPrefixFromVariable: (in category 'utilities') -----
returnPrefixFromVariable: aName
aName = 'class'
ifTrue: [^'sq_class'].
+ aName = 'in'
+ ifTrue: [^'in_'].
^aName!
Item was changed:
----- Method: JSMethod>>emitJSHeaderOn:generator: (in category 'JS code generation') -----
emitJSHeaderOn: aStream generator: aCodeGen
"Emit a C function header for this method onto the given stream."
aStream cr.
self emitJSFunctionHeader: aStream generator: aCodeGen.
aStream nextPutAll: ' {'; cr.
self emitGlobalStructReferenceOn: aStream.
locals do: [ :var | | varDecl |
aStream nextPutAll: ' var ', (aCodeGen returnPrefixFromVariable: var).
varDecl := declarations at: var asString ifAbsent: [''].
(varDecl includes: $=)
ifTrue: [ | const |
const := ((varDecl copyAfter: $=) replaceAll: ${ with: $[) replaceAll: $} with: $].
aStream nextPutAll: ' =', const]
ifFalse: [(varDecl includes: $[)
ifTrue: [ | size |
size := (varDecl copyAfter: $[) copyUpTo: $].
size ifEmpty: [self halt].
aStream nextPutAll: ' = new Array(', size, ')']].
aStream nextPutAll: ';'; cr
].
+ (#(primitiveExtractChannel primitiveCondenseSound) includes: selector)
+ ifTrue: [#(src dst) do: [:v | aStream nextPutAll: ' var _', v, ' = 0;'; cr]].
locals isEmpty ifFalse: [ aStream cr ].!
Item was added:
+ ----- Method: JSPluginCodeGenerator>>ignoredMethods (in category 'public') -----
+ ignoredMethods
+ pluginName = 'BitBltSimulation' ifTrue: [
+ ^#(dstLongAt: dstLongAt:put: srcLongAt:)].
+ pluginName = 'ScratchPlugin' ifTrue: [
+ ^(ScratchPlugin organization listAtCategoryNamed: 'serial port'),
+ (ScratchPlugin organization listAtCategoryNamed: 'os functions')].
+ !
Item was added:
+ ----- Method: JSPluginCodeGenerator>>pluginName (in category 'public') -----
+ pluginName
+ ^pluginName!
More information about the Vm-dev
mailing list