Vm-dev June 2013

vm-dev@lists.squeakfoundation.org

16 participants
88 discussions

VM crash when updating image
by Frank Shearar 27 Jun '13

27 Jun '13

I just got a new laptop (running Windows 8), and bootstrapped a CI environment (checked out squeak-smaltalk/squeak-ci etc). I took its Squeak4.5.image with a Cog r2732 VM and updated it. Several merge conflicts later a dialog popped up saying Sorry but the VM has crashed Exception code: C0000005 Exception address: 1008D13C Current byte code: -1 Primitive index: 85 I've attached the crashdump. I'll see if I can't trigger this thing reliably, in the meantime. frank

1 0

VM Maker: CMakeVMMaker-GuillermoPolito.209.mcz
by commits＠source.squeak.org 27 Jun '13

27 Jun '13

Guillermo Polito uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-GuillermoPolito.209.mcz ==================== Summary ==================== Name: CMakeVMMaker-GuillermoPolito.209 Author: GuillermoPolito Time: 27 June 2013, 1:29:44.067 am UUID: 7a50eff6-f801-4fdb-90b7-a57c60e1f538 Ancestors: CMakeVMMaker-GuillermoPolito.208 fixes for Unix configs =============== Diff against CMakeVMMaker-GuillermoPolito.208 =============== Item was changed: ----- Method: CPlatformConfig>>srcDir (in category 'accessing') ----- srcDir "Answer the value of srcDir" + ^ srcDir ifNil: [ srcDir := (self topDir / self srcDirName) ensureDirectory fullName ]! - ^ srcDir ifNil: [ srcDir := (self topDir / self srcDirName) assureExistence fullName ]! Item was changed: ----- Method: CPlatformConfig>>write:toFile: (in category 'directories') ----- write: aContents toFile: aFileName "write a file to current output directory (buildDir). use line end convention appropriate for config platform" | bldDir | bldDir := self buildDir. bldDir isString ifTrue: [ bldDir := bldDir asFileReference ]. bldDir ensureDirectory. + (bldDir / aFileName) + ensureFile + writeStream + nextPutAll: (self fixLineEndsOf: aContents)! - FileStream - forceNewFileNamed: (bldDir / aFileName) fullName - do: [ :stream | stream nextPutAll: (self fixLineEndsOf: aContents) ]! Item was changed: ----- Method: CogFamilyUnixConfig>>addDriver:sources:generator:externalLibs: (in category 'utils') ----- addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs | cfg srcs | srcs := aSources inject: '' into: [:res :each | res , ' "', each, '"' ]. cfg := cmakeGen captureOutputDuring: [ cmakeGen printHeader; project: name; include: '../directories.cmake'; message: 'Adding module: ', name; addDefinitions: self compilerFlags; addDefinitions: '-fPIC -DPIC'; set: #sources to: srcs; cmd: 'add_library' params: name, ' SHARED ${sources}'; includeDirectories: '${crossDir}/plugins/FilePlugin'; includeDirectories: '${targetPlatform}/plugins/B3DAcceleratorPlugin'; includeDirectories: '${crossDir}/plugins/B3DAcceleratorPlugin'; + set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName; - set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir; addExternalLibraries: extLibs; cmd: 'target_link_libraries' params: name , ' ${LINKLIBS}'; cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX "" LINK_FLAGS -m32' ]. + (self buildDir / name) ensureDirectory. + self write: cfg toFile: name , '/', cmakeGen outputFileName. - - self write: cfg toFile: ((self buildDir / name) assureExistence / cmakeGen outputFileName) fullName. cmakeGen addSubdirectory: name. ! Item was changed: ----- Method: CogFamilyUnixConfig>>outputDir (in category 'directories') ----- outputDir "the directory where built binaries will be stored" + ^ outputDir ifNil: [ outputDir := (self buildDir parent / self outputDirName) ] ! - ^ outputDir ifNil: [ outputDir := (self buildDir containingDirectory fullName , '/', self outputDirName) ] - ! Item was changed: ----- Method: CogFamilyUnixConfig>>setExtraTargetProperties: (in category 'utils') ----- setExtraTargetProperties: maker maker addExternalLibraries: #( 'm' "math lib" 'dl' "dynamic loader" 'pthread' "posix threads" ). + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir. self addVMDrivers: maker.! Item was changed: ----- Method: CogFamilyWindowsConfig>>outputDir (in category 'directories') ----- outputDir "the directory where built binaries will be stored" + ^ outputDir ifNil: [ outputDir := self msysPathFor: (self buildDir parent / self outputDirName) ]! - ^ outputDir ifNil: [ outputDir := self msysPathFor: (self buildDir containingDirectory fullName , '/', self outputDirName) ] - ! Item was changed: ----- Method: StackEvtAndroidConfig>>outputDir (in category 'directories') ----- outputDir "the directory where built binaries will be stored - for now it is copied from CogFamilyUnixConfig" + ^ outputDir ifNil: [ outputDir := (self buildDir parent / self outputDirName) ] - ^ outputDir ifNil: [ outputDir := (self buildDir containingDirectory fullName , '/', self outputDirName) ] !

1 0

Re: [Vm-dev] VM Maker: VMMaker-dtl.322.mcz
by David T. Lewis 23 Jun '13

23 Jun '13

Tim: I regenerated the sources on Subversion trunk/src with your BitBltPlugin enhancements. The VMMaker versionString change here is used in the Unix build to identify the name of the installation subdirectory, so I updated it here prior to generating the sources. Dave On Sun, Jun 23, 2013 at 12:22:48AM +0000, commits(a)source.squeak.org wrote: > > David T. Lewis uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker-dtl.322.mcz > > ==================== Summary ==================== > > Name: VMMaker-dtl.322 > Author: dtl > Time: 22 June 2013, 8:16:02.802 pm > UUID: 8c6464c8-9bdc-40bc-90fe-4bf2b642ff2d > Ancestors: VMMaker-tpr.321 > > VMMaker 4.12.5 > Update version string for VMMaker-tpr.321 > > =============== Diff against VMMaker-tpr.321 =============== > > Item was changed: > ----- Method: VMMaker class>>versionString (in category 'version testing') ----- > versionString > > "VMMaker versionString" > > + ^'4.12.5'! > - ^'4.12.4'!

1 0

VM Maker: VMMaker-dtl.322.mcz
by commits＠source.squeak.org 23 Jun '13

23 Jun '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.322.mcz ==================== Summary ==================== Name: VMMaker-dtl.322 Author: dtl Time: 22 June 2013, 8:16:02.802 pm UUID: 8c6464c8-9bdc-40bc-90fe-4bf2b642ff2d Ancestors: VMMaker-tpr.321 VMMaker 4.12.5 Update version string for VMMaker-tpr.321 =============== Diff against VMMaker-tpr.321 =============== Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.12.5'! - ^'4.12.4'!

1 0

Building StackVM with faster bitblt; problems, problems
by tim Rowledge 22 Jun '13

22 Jun '13

Now that the faster bitblt is working for the plain interpreter it is time to try to incorporate it into the StackVM on the Pi. Unfortunately, the StackVM still uses the old autoconf stuff to put together the makefiles. I'm not making a whole lot of sense out of what goes on and I really need some help. + I don't have the openGL developer stuff on my Pi and thus the B3DAcceleratorPlugin can't build. Perhaps I should load it but I'm rather inclined to think that the configure ought to test for the presence of the libraries and not make the plugin as appropriate. So far as I can tell the configure script *is* in fact checking for openGL and if I'm reading the config.log & confige.status files correctly has detected the absence (ac_cv_header_GL_gl_h=no is the relevant line). How are plugins excluded by the configure script tests? + similarly for the SqueakSSLPlugin, except I can't spot + sometime back in April I had to stop it making the mpeg3, klatt & croquet plugins and now I can't work out WTF I did to cause that. Sigh. What did I do? + how can I add the new files needed by the bitbltplugin? Configure does actually automatically add the .c files to the constructed bitbltplugin/Makefile but *not* the .s files + in a similar problem there is a .s file needed in the vm-display-x11 module; if I add it to the OBJS variable in the relevant makefile.in fragment, it appears in the generated makefile ok but I get a 'no rule to make foo' error. I thought unixy makefile stuff handled assembler files by default? If not, how do I get them built and where do I specify (or discover in the config?) that it should be using asasm? + I suspect it would be good practise to not even try to refer to the fast bitblt files unless the relevant switch was set in the configure. How do we do that? While pointers to good doc explaining how to do this kind of thing would be nice, direct advice on the 'do this, do that, make' level would be ver y welcome. I'm not overly excited about trying to become expert at autoconf. With luck I'll never have to do anything other than ../configure' etc after this particular task. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Strange OpCodes: LJD: Lock Job on Disk

3 4

VM Maker: VMMaker.oscog-tpr.301.mcz
by commits＠source.squeak.org 22 Jun '13

22 Jun '13

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.301.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.301 Author: tpr Time: 21 June 2013, 6:54:41.276 pm UUID: df2e88d5-5589-4cc2-b52d-3069e8d746a3 Ancestors: VMMaker.oscog-eem.300 Faster bitblt integration, pt 1. Add #define switch for use of new code - 'ENABLE_FAST_BLT'. makefile related stuff still to come. Also fix bug in VMMakerTool. =============== Diff against VMMaker.oscog-eem.300 =============== Item was changed: ----- Method: BitBltSimulation class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator + + "add option of fast path BitBLT code header" + aCCodeGenerator + addHeaderFile:'#ifdef ENABLE_FAST_BLT + #include "BitBltDispatch.h" + #else + // to handle the unavoidable decl in the spec of copyBitsFallback(); + #define operation_t void + #endif'. + aCCodeGenerator var: 'opTable' declareC: 'void *opTable[' , OpTableSize printString , ']'. aCCodeGenerator var: 'maskTable' declareC:'int maskTable[33] = { 0, 1, 3, 0, 15, 31, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 65535, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }'. aCCodeGenerator var: 'ditherMatrix4x4' declareC:'const int ditherMatrix4x4[16] = { 0, 8, 2, 10, 12, 4, 14, 6, 3, 11, 1, 9, 15, 7, 13, 5 }'. aCCodeGenerator var: 'ditherThresholds16' declareC:'const int ditherThresholds16[8] = { 0, 2, 4, 6, 8, 12, 14, 16 }'. aCCodeGenerator var: 'ditherValues16' declareC:'const int ditherValues16[32] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 }'. aCCodeGenerator var: 'warpBitShiftTable' declareC:'int warpBitShiftTable[32]'. aCCodeGenerator var:'cmShiftTable' type:'int *'. aCCodeGenerator var:'cmMaskTable' type:'unsigned int *'. aCCodeGenerator var:'cmLookupTable' type:'unsigned int *'. aCCodeGenerator var: 'dither8Lookup' declareC:' unsigned char dither8Lookup[4096]'. aCCodeGenerator var:'ungammaLookupTable' type: 'unsigned char *'. aCCodeGenerator var:'gammaLookupTable' type: 'unsigned char *'. aCCodeGenerator var: 'querySurfaceFn' type: 'void *'. aCCodeGenerator var: 'lockSurfaceFn' type: 'void *'. aCCodeGenerator var: 'unlockSurfaceFn' type: 'void *'! Item was changed: ----- Method: BitBltSimulation>>copyBits (in category 'setup') ----- copyBits "This function is exported for the Balloon engine" <export: true> <inline: false> self clipRange. (bbW <= 0 or: [bbH <= 0]) ifTrue: ["zero width or height; noop" affectedL := affectedR := affectedT := affectedB := 0. ^ nil]. "Lock the surfaces" self lockSurfaces ifFalse:[^interpreterProxy primitiveFail]. + + self + cppIf: #'ENABLE_FAST_BLT' + ifTrue:["you really, really mustn't call this unless you have the rest of the code to link to" + self copyBitsFastPathSpecialised] + ifFalse:[self copyBitsLockedAndClipped]. + - self copyBitsLockedAndClipped. self unlockSurfaces.! Item was added: + ----- Method: BitBltSimulation>>copyBits:Fallback: (in category 'setup') ----- + copyBits: op Fallback: flags + "Recover from the fast path specialised code saying Help-I-cant-cope" + |done | + <static: false> + <returnTypeC: 'void'> + <inline: false> + <var: #op type: 'operation_t *'> + <var: #flags type:'unsigned int'> + self cppIf: #'ENABLE_FAST_BLT' + ifTrue:[ + "recover values from the operation struct used by the fast ARM code" + self cCode:' + combinationRule = op->combinationRule; + noSource = op->noSource; + sourceBits = (sqInt) op->src.bits; + sourcePitch = op->src.pitch; + sourceDepth = op->src.depth; + sourceMSB = op->src.msb; + sx = op->src.x; + sy = op->src.y; + destBits = (sqInt) op->dest.bits; + destPitch = op->dest.pitch; + destDepth = op->dest.depth; + destMSB = op->dest.msb; + dx = op->dest.x; + dy = op->dest.y; + bbW = op->width; + bbH = op->height; + cmFlags = op->cmFlags; + cmShiftTable = (void *) op->cmShiftTable; + cmMaskTable = (void *) op->cmMaskTable; + cmMask = op->cmMask; + cmLookupTable = (void *) op->cmLookupTable; + noHalftone = op->noHalftone; + halftoneHeight = op->halftoneHeight; + halftoneBase = (sqInt) op->halftoneBase; + if (combinationRule == 30 || combinationRule == 31) { + sourceAlpha = op->opt.sourceAlpha; + } + if (combinationRule == 41) { + componentAlphaModeColor = op->opt.componentAlpha.componentAlphaModeColor; + componentAlphaModeAlpha = op->opt.componentAlpha.componentAlphaModeAlpha; + gammaLookupTable = (void *) op->opt.componentAlpha.gammaLookupTable; + ungammaLookupTable = (void *) op->opt.componentAlpha.ungammaLookupTable; + }'. + + destPPW := 32 / destDepth. + cmBitsPerColor := 0. + cmMask = 16r1FF ifTrue: [cmBitsPerColor := 3]. + cmMask = 16rFFF ifTrue: [cmBitsPerColor := 4]. + cmMask = 16r3FFF ifTrue: [cmBitsPerColor := 5]. + + "Try a shortcut for stuff that should be run as quickly as possible" + done := self tryCopyingBitsQuickly. + done ifTrue:[^nil]. + + bitCount := 0. + "Choose and perform the actual copy loop." + self performCopyLoop] + + + + + ! Item was added: + ----- Method: BitBltSimulation>>copyBitsFastPathSpecialised (in category 'setup') ----- + copyBitsFastPathSpecialised + "Perform the actual copyBits operation using the fast path specialised code; fail some cases by falling back to normal code. + Assume: Surfaces have been locked and clipping was performed." + <inline: false> + + self + cppIf: #'ENABLE_FAST_BLT' + ifTrue:[ + "set the affected area to 0 first" + affectedL := affectedR := affectedT := affectedB := 0. + + self copyBitsRule41Test. + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + + "we skip the tryCopyingBitsQuickly and leave that to falback code" + + (combinationRule = 30) | (combinationRule = 31) ifTrue: + ["Check and fetch source alpha parameter for alpha blend" + interpreterProxy methodArgumentCount = 1 + ifTrue: [sourceAlpha := interpreterProxy stackIntegerValue: 0. + (interpreterProxy failed not and: [(sourceAlpha >= 0) & (sourceAlpha <= 255)]) + ifFalse: [^ interpreterProxy primitiveFail]] + ifFalse: [^ interpreterProxy primitiveFail]]. + + "we don't worry about bitCount" + "bitCount := 0." + + "We don't do - Choose and perform the actual copy loop." + "self performCopyLoop." + + "this is done inversely to plain copyBitsLockedAndClipped" + (combinationRule ~= 22) & (combinationRule ~= 32) ifTrue: + ["zero width and height; return the count" + affectedL := dx. + affectedR := dx + bbW. + affectedT := dy. + affectedB := dy + bbH]. + + "Now we fill the 'operation' structure and pass it to the sneaky ARM code" + self cCode:' + // fill the operation structure + operation_t op; + op.combinationRule = combinationRule; + op.noSource = noSource; + op.src.bits = (void *) sourceBits; + op.src.pitch = sourcePitch; + op.src.depth = sourceDepth; + op.src.msb = sourceMSB; + op.src.x = sx; + op.src.y = sy; + op.dest.bits = (void *) destBits; + op.dest.pitch = destPitch; + op.dest.depth = destDepth; + op.dest.msb = destMSB; + op.dest.x = dx; + op.dest.y = dy; + op.width = bbW; + op.height = bbH; + op.cmFlags = cmFlags; + op.cmShiftTable = (void *) cmShiftTable; + op.cmMaskTable = (void *) cmMaskTable; + op.cmMask = cmMask; + op.cmLookupTable = (void *) cmLookupTable; + op.noHalftone = noHalftone; + op.halftoneHeight = halftoneHeight; + op.halftoneBase = (void *) halftoneBase; + if (combinationRule == 30 || combinationRule == 31) { + op.opt.sourceAlpha = sourceAlpha; + } + if (combinationRule == 41) { + op.opt.componentAlpha.componentAlphaModeColor = componentAlphaModeColor; + op.opt.componentAlpha.componentAlphaModeAlpha = componentAlphaModeAlpha; + op.opt.componentAlpha.gammaLookupTable = (void *) gammaLookupTable; + op.opt.componentAlpha.ungammaLookupTable = (void *) ungammaLookupTable; + } + // call the sneaky code + copyBitsDispatch(&op)' + ]! Item was changed: ----- Method: BitBltSimulation>>copyBitsLockedAndClipped (in category 'setup') ----- copyBitsLockedAndClipped "Perform the actual copyBits operation. Assume: Surfaces have been locked and clipping was performed." + | done | + <inline: false> - | done gammaLookupTableOop ungammaLookupTableOop | - <inline: true> - "Try a shortcut for stuff that should be run as quickly as possible" + self copyBitsRule41Test. + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + + "Try a shortcut for stuff that should be run as quickly as possible" + done := self tryCopyingBitsQuickly. - combinationRule = 41 - ifTrue:["fetch the forecolor into componentAlphaModeColor." - componentAlphaModeAlpha := 255. - componentAlphaModeColor := 16777215. - gammaLookupTable := nil. - ungammaLookupTable := nil. - interpreterProxy methodArgumentCount >= 2 - ifTrue:[ - componentAlphaModeAlpha := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 2). - (interpreterProxy failed not) - ifFalse: [^ interpreterProxy primitiveFail]. - componentAlphaModeColor := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 1). - (interpreterProxy failed not) - ifFalse: [^ interpreterProxy primitiveFail]. - interpreterProxy methodArgumentCount = 4 - ifTrue:[ - gammaLookupTableOop := interpreterProxy stackObjectValue: 1. - (interpreterProxy isBytes: gammaLookupTableOop) - ifTrue:[gammaLookupTable := interpreterProxy firstIndexableField: gammaLookupTableOop.]. - ungammaLookupTableOop := interpreterProxy stackObjectValue: 0. - (interpreterProxy isBytes: ungammaLookupTableOop) - ifTrue:[ungammaLookupTable := interpreterProxy firstIndexableField: ungammaLookupTableOop]]] - ifFalse:[ - interpreterProxy methodArgumentCount = 1 - ifTrue: [ - componentAlphaModeColor := interpreterProxy stackIntegerValue: 0. - (interpreterProxy failed not) - ifFalse: [^ interpreterProxy primitiveFail]] - ifFalse:[^ interpreterProxy primitiveFail]]]. - - done := self tryCopyingBitsQuickly. done ifTrue:[^nil]. (combinationRule = 30) | (combinationRule = 31) ifTrue: ["Check and fetch source alpha parameter for alpha blend" interpreterProxy methodArgumentCount = 1 ifTrue: [sourceAlpha := interpreterProxy stackIntegerValue: 0. (interpreterProxy failed not and: [(sourceAlpha >= 0) & (sourceAlpha <= 255)]) ifFalse: [^ interpreterProxy primitiveFail]] ifFalse: [^ interpreterProxy primitiveFail]]. bitCount := 0. "Choose and perform the actual copy loop." self performCopyLoop. (combinationRule = 22) | (combinationRule = 32) ifTrue: ["zero width and height; return the count" affectedL := affectedR := affectedT := affectedB := 0]. hDir > 0 ifTrue: [affectedL := dx. affectedR := dx + bbW] ifFalse: [affectedL := dx - bbW + 1. affectedR := dx + 1]. vDir > 0 ifTrue: [affectedT := dy. affectedB := dy + bbH] ifFalse: [affectedT := dy - bbH + 1. affectedB := dy + 1]! Item was added: + ----- Method: BitBltSimulation>>copyBitsRule41Test (in category 'setup') ----- + copyBitsRule41Test + "Test possible use of rule 41, rgbComponentAlpha:with: Nothing to return, just set up some variables" + | gammaLookupTableOop ungammaLookupTableOop | + <inline: false> + + combinationRule = 41 + ifTrue:["fetch the forecolor into componentAlphaModeColor." + componentAlphaModeAlpha := 255. + componentAlphaModeColor := 16777215. + gammaLookupTable := nil. + ungammaLookupTable := nil. + interpreterProxy methodArgumentCount >= 2 + ifTrue:[ + componentAlphaModeAlpha := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 2). + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + componentAlphaModeColor := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 1). + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + interpreterProxy methodArgumentCount = 4 + ifTrue:[ + gammaLookupTableOop := interpreterProxy stackObjectValue: 1. + (interpreterProxy isBytes: gammaLookupTableOop) + ifTrue:[gammaLookupTable := interpreterProxy firstIndexableField: gammaLookupTableOop.]. + ungammaLookupTableOop := interpreterProxy stackObjectValue: 0. + (interpreterProxy isBytes: ungammaLookupTableOop) + ifTrue:[ungammaLookupTable := interpreterProxy firstIndexableField: ungammaLookupTableOop]]] + ifFalse:[ + interpreterProxy methodArgumentCount = 1 + ifTrue: [ + componentAlphaModeColor := interpreterProxy stackIntegerValue: 0. + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]] + ifFalse:[^ interpreterProxy primitiveFail]]]. + + + ! Item was changed: ----- Method: VMMakerTool>>generateSelectedInternalPlugin (in category 'generate sources') ----- generateSelectedInternalPlugin | pluginName | pluginName := self internalModules + at: self currentInternalModuleIndex - at: self currentExternalModuleIndex ifAbsent: [^self inform: 'no such plugin']. vmMaker interpreterClass ifNil: [^self inform: 'please set an interpreter class'] ifNotNil: [:interpreterClass| interpreterClass initialize]. self checkOK ifTrue: [[(Smalltalk classNamed: pluginName) touch. vmMaker generateInternalPlugin: pluginName] on: VMMakerException do: [:ex| self inform: ex messageText]]!

1 0

VM Maker: VMMaker.oscog-eem.300.mcz
by commits＠source.squeak.org 22 Jun '13

22 Jun '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.300.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.300 Author: eem Time: 21 June 2013, 4:34:38.785 pm UUID: b52f5f3d-b4e2-4bfb-ba9a-a6b55c71a8d3 Ancestors: VMMaker.oscog-eem.299 Fix type errors in the Cogit that prevent the Cogit working when compiled with clang. Specifically void * pointers are not comparable. Make sure that fetchPointer:ofObject: & isIntegerValue: are declared in cointerp.h. =============== Diff against VMMaker.oscog-eem.299 =============== Item was changed: ----- Method: CogARMCompiler>>sizePCDependentInstructionAt: (in category 'generate machine code') ----- sizePCDependentInstructionAt: eventualAbsoluteAddress "Size a jump and set its address. The target may be another instruction or an absolute address. On entry the address inst var holds our virtual address. On exit address is set to eventualAbsoluteAddress, which is where this instruction will be output. The span of a jump to a following instruction is therefore between that instruction's address and this instruction's address ((which are both still their virtual addresses), but the span of a jump to a preceeding instruction or to an absolute address is between that instruction's address (which by now is its eventual absolute address) or absolute address and eventualAbsoluteAddress." + | target maximumSpan abstractInstruction | - | target maximumSpan | <var: #abstractInstruction type: #'AbstractInstruction *'> opcode = AlignmentNops ifTrue: [| alignment | address := eventualAbsoluteAddress. alignment := operands at: 0. ^machineCodeSize := (eventualAbsoluteAddress + (alignment - 1) bitAnd: alignment negated) - eventualAbsoluteAddress]. self assert: (self isJump or: [opcode = Call]). self isJump ifTrue: [self resolveJumpTarget]. target := operands at: 0. + abstractInstruction := cogit cCoerceSimple: target to: #'AbstractInstruction *'. "maximumSpan calculation copied from CogIA32Compiler TODO: extract method?" + (self isAnInstruction: abstractInstruction) - (self isAnInstruction: (cogit cCoerceSimple: target to: #'void *')) ifTrue: + [maximumSpan := abstractInstruction address - [| abstractInstruction | - abstractInstruction := cogit cCoerceSimple: target to: #'AbstractInstruction *'. - maximumSpan := abstractInstruction address - (((cogit abstractInstruction: self follows: abstractInstruction) ifTrue: [eventualAbsoluteAddress] ifFalse: [address]) + 2)] ifFalse: [maximumSpan := target - (eventualAbsoluteAddress + 2)]. address := eventualAbsoluteAddress. ^machineCodeSize := opcode = Call ifTrue: [(self isQuick: maximumSpan) ifTrue: [4] ifFalse: [20]] ifFalse: [(self isLongJump not and: [self isQuick: maximumSpan]) ifTrue: [4] ifFalse: [16]] "load address to register, add"! Item was changed: ----- Method: CogARMCompilerTests>>assertSaneJumpTarget: (in category 'cogit compiler compatibility') ----- assertSaneJumpTarget: jumpTarget + <var: #jumpTarget type: #'AbstractInstruction *'> - <var: #jumpTarget type: #'void *'> self assert: (self addressIsInInstructions: jumpTarget)! Item was changed: ----- Method: CogAbstractInstruction>>isAnInstruction: (in category 'testing') ----- isAnInstruction: addressOrInstruction + <var: #addressOrInstruction type: #'AbstractInstruction *'> - <var: #addressOrInstruction type: #'void *'> ^cogit addressIsInInstructions: addressOrInstruction! Item was changed: ----- Method: CogIA32Compiler>>concretizeMoveAwR (in category 'generate machine code') ----- concretizeMoveAwR "Will get inlined into concretizeAt: switch." <inline: true> | addressOperand reg | addressOperand := operands at: 0. + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *')) ifTrue: - (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'void *')) ifTrue: [addressOperand := (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *') address]. reg := self concreteRegister: (operands at: 1). reg = EAX ifTrue: [machineCode at: 0 put: 16rA1; at: 1 put: (addressOperand bitAnd: 16rFF); at: 2 put: (addressOperand >> 8 bitAnd: 16rFF); at: 3 put: (addressOperand >> 16 bitAnd: 16rFF); at: 4 put: (addressOperand >> 24 bitAnd: 16rFF). ^machineCodeSize := 5]. machineCode at: 0 put: 16r8B; at: 1 put: (self mod: ModRegInd RM: 5 RO: reg); at: 2 put: (addressOperand bitAnd: 16rFF); at: 3 put: (addressOperand >> 8 bitAnd: 16rFF); at: 4 put: (addressOperand >> 16 bitAnd: 16rFF); at: 5 put: (addressOperand >> 24 bitAnd: 16rFF). ^machineCodeSize := 6! Item was changed: ----- Method: CogIA32Compiler>>concretizeMoveRAw (in category 'generate machine code') ----- concretizeMoveRAw "Will get inlined into concretizeAt: switch." <inline: true> | addressOperand reg | reg := self concreteRegister: (operands at: 0). addressOperand := operands at: 1. + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *')) ifTrue: - (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'void *')) ifTrue: [addressOperand := (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *') address]. reg = EAX ifTrue: [machineCode at: 0 put: 16rA3; at: 1 put: (addressOperand bitAnd: 16rFF); at: 2 put: (addressOperand >> 8 bitAnd: 16rFF); at: 3 put: (addressOperand >> 16 bitAnd: 16rFF); at: 4 put: (addressOperand >> 24 bitAnd: 16rFF). ^machineCodeSize := 5]. machineCode at: 0 put: 16r89; at: 1 put: (self mod: ModRegInd RM: 5 RO: reg); at: 2 put: (addressOperand bitAnd: 16rFF); at: 3 put: (addressOperand >> 8 bitAnd: 16rFF); at: 4 put: (addressOperand >> 16 bitAnd: 16rFF); at: 5 put: (addressOperand >> 24 bitAnd: 16rFF). ^machineCodeSize := 6! Item was changed: ----- Method: CogIA32Compiler>>sizePCDependentInstructionAt: (in category 'generate machine code') ----- sizePCDependentInstructionAt: eventualAbsoluteAddress "Size a jump and set its address. The target may be another instruction or an absolute address. On entry the address inst var holds our virtual address. On exit address is set to eventualAbsoluteAddress, which is where this instruction will be output. The span of a jump to a following instruction is therefore between that instruction's address and this instruction's address ((which are both still their virtual addresses), but the span of a jump to a preceeding instruction or to an absolute address is between that instruction's address (which by now is its eventual absolute address) or absolute address and eventualAbsoluteAddress." + | target maximumSpan abstractInstruction | - | target maximumSpan | <var: #abstractInstruction type: #'AbstractInstruction *'> opcode = AlignmentNops ifTrue: [| alignment | address := eventualAbsoluteAddress. alignment := operands at: 0. ^machineCodeSize := (eventualAbsoluteAddress + (alignment - 1) bitAnd: alignment negated) - eventualAbsoluteAddress]. self assert: self isJump. target := operands at: 0. + abstractInstruction := cogit cCoerceSimple: target to: #'AbstractInstruction *'. + (self isAnInstruction: abstractInstruction) - (self isAnInstruction: (cogit cCoerceSimple: target to: #'void *')) ifTrue: + [maximumSpan := abstractInstruction address - [| abstractInstruction | - abstractInstruction := cogit cCoerceSimple: target to: #'AbstractInstruction *'. - maximumSpan := abstractInstruction address - (((cogit abstractInstruction: self follows: abstractInstruction) ifTrue: [eventualAbsoluteAddress] ifFalse: [address]) + 2)] ifFalse: [maximumSpan := target - (eventualAbsoluteAddress + 2)]. address := eventualAbsoluteAddress. ^machineCodeSize := opcode >= FirstShortJump ifTrue: [(self isQuick: maximumSpan) ifTrue: [2] ifFalse: [opcode = Jump ifTrue: [5] ifFalse: [6]]] ifFalse: [opcode = JumpLong ifTrue: [5] ifFalse: [6]]! Item was changed: ----- Method: CogIA32CompilerTests>>assertSaneJumpTarget: (in category 'cogit compatibility') ----- assertSaneJumpTarget: jumpTarget + <var: #jumpTarget type: #'AbstractInstruction *'> - <var: #jumpTarget type: #'void *'> self assert: (self addressIsInInstructions: jumpTarget)! Item was changed: ----- Method: CogMethodZone>>methodFor: (in category 'jit - api') ----- methodFor: address <api> <returnTypeC: #'CogMethod *'> <var: #address type: #'void *'> | cogMethod nextMethod | <var: #cogMethod type: #'CogMethod *'> <var: #nextMethod type: #'CogMethod *'> cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. [cogMethod < self limitZony + and: [cogMethod asUnsignedInteger <= address asUnsignedInteger]] whileTrue: - and: [(self cCoerceSimple: cogMethod to: #'void *') <= address]] whileTrue: [nextMethod := self methodAfter: cogMethod. nextMethod = cogMethod ifTrue: [^0]. + (address asUnsignedInteger >= cogMethod asUnsignedInteger + and: [address asUnsignedInteger < nextMethod asUnsignedInteger]) ifTrue: - (address >= (self cCoerceSimple: cogMethod to: #'void *') - and: [address < (self cCoerceSimple: nextMethod to: #'void *')]) ifTrue: [^cogMethod]. cogMethod := nextMethod]. ^0! Item was changed: ----- Method: Cogit>>addressIsInFixups: (in category 'testing') ----- addressIsInFixups: address + <var: #address type: #'AbstractInstruction *'> + ^self cCode: 'address >= (AbstractInstruction *)&fixups[0] && address < (AbstractInstruction *)&fixups[numAbstractOpcodes]' - <var: #address type: #'void *'> - ^self cCode: 'address >= (void *)&fixups[0] && address < (void *)&fixups[numAbstractOpcodes]' inSmalltalk: [fixups notNil and: [(fixups object identityIndexOf: address) between: 1 and: numAbstractOpcodes]]! Item was changed: ----- Method: Cogit>>addressIsInInstructions: (in category 'testing') ----- addressIsInInstructions: address + <var: #address type: #'AbstractInstruction *'> + ^self cCode: 'address >= &abstractOpcodes[0] && address < &abstractOpcodes[opcodeIndex]' - <var: #address type: #'void *'> - ^self cCode: 'address >= (void *)&abstractOpcodes[0] && address < (void *)&abstractOpcodes[opcodeIndex]' inSmalltalk: [(abstractOpcodes object identityIndexOf: address) between: 1 and: opcodeIndex]! Item was changed: ----- Method: Cogit>>assertSaneJumpTarget: (in category 'debugging') ----- assertSaneJumpTarget: jumpTarget + <var: #jumpTarget type: #'AbstractInstruction *'> - <var: #jumpTarget type: #'void *'> self assert: (closedPICSize isNil "don't whinge when producing the PIC prototypes" or: [openPICSize isNil or: [(self addressIsInInstructions: jumpTarget) + or: [(jumpTarget asUnsignedInteger - or: [(jumpTarget asInteger between: codeBase and: methodZone limitZony asInteger + (closedPICSize max: openPICSize))]]])! Item was changed: ----- Method: ObjectMemory>>fetchPointer:ofObject: (in category 'interpreter access') ----- fetchPointer: fieldIndex ofObject: oop "index by word size, and return a pointer as long as the word size" + <api> + ^self longAt: oop + BaseHeaderSize + (fieldIndex << ShiftForWord)! - - ^ self longAt: oop + BaseHeaderSize + (fieldIndex << ShiftForWord)! Item was changed: ----- Method: ObjectMemory>>isIntegerValue: (in category 'interpreter access') ----- isIntegerValue: intValue "Answer if the given value can be represented as a Smalltalk integer value. In C, use a shift and XOR to set the sign bit if and only if the top two bits of the given value are the same, then test the sign bit. Note that the top two bits are equal for exactly those integers in the range that can be represented in 31-bits or 63-bits." + <api> - ^self cCode: [(intValue bitXor: (intValue << 1)) >= 0] inSmalltalk: [intValue >= 16r-40000000 and: [intValue <= 16r3FFFFFFF]]! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>addressIsInInstructions: (in category 'testing') ----- addressIsInInstructions: address + <var: #address type: #'AbstractInstruction *'> - <var: #address type: #'void *'> ^self cCode: + 'address >= &abstractOpcodes[0] && address < &abstractOpcodes[opcodeIndex] + || address >= &counters[0] && address < &counters[counterIndex]' - 'address >= (void *)&abstractOpcodes[0] && address < (void *)&abstractOpcodes[opcodeIndex] - || address >= (void *)&counters[0] && address < (void *)&counters[counterIndex]' inSmalltalk: [((abstractOpcodes object identityIndexOf: address) between: 1 and: opcodeIndex) or: [(counters object identityIndexOf: address) between: 1 and: counterIndex]]!

1 0

VM Maker: VMMaker-oscog-GuillermoPolito.243.mcz
by commits＠source.squeak.org 19 Jun '13

19 Jun '13

Guillermo Polito uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-GuillermoPolito.243.mcz ==================== Summary ==================== Name: VMMaker-oscog-GuillermoPolito.243 Author: GuillermoPolito Time: 19 June 2013, 4:31:57.034 pm UUID: 72f3c5f0-eef2-4802-8042-603e6821dd5d Ancestors: VMMaker-oscog-GuillermoPolito.242 fixing extension handling =============== Diff against VMMaker-oscog-GuillermoPolito.242 =============== Item was changed: ----- Method: Gnuifier>>gnuify (in category 'as yet unclassified') ----- gnuify "This Gnuifier produces a file compatible with gcc 3.x and gcc 4.x. We label the gnuified VM so one can identify the valid gcc version. The script run on Wndows, platforms/win32/misc/gnuify, produces something compatible with gcc 2.95 (gack)." (directory asFileReference / ('gcc3x-', interpreterFilename)) ensureDeleted. self gnuifyFrom: (FileStream oldFileNamed: (directory asFileReference / interpreterFilename) fullName) + to: (VMMaker forceNewFileNamed: (directory asFileReference / ('gcc3x-', interpreterFilename)) fullName ) - to: (VMMaker forceNewFileNamed: (directory asFileReference / 'gcc3x-', interpreterFilename) fullName ) !

1 0

VM Maker: VMMaker-oscog-GuillermoPolito.242.mcz
by commits＠source.squeak.org 19 Jun '13

19 Jun '13

Guillermo Polito uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-GuillermoPolito.242.mcz ==================== Summary ==================== Name: VMMaker-oscog-GuillermoPolito.242 Author: GuillermoPolito Time: 19 June 2013, 2:54:45.742 pm UUID: 85dc4488-f9fd-45ac-834f-a0792438e3e5 Ancestors: VMMaker-oscog-GuillermoPolito.241 fixing extension handling =============== Diff against VMMaker-oscog-GuillermoPolito.241 =============== Item was changed: ----- Method: ADPCMCodecPlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case code string rather than generated code" "Not currently hooked into the timeStamp mechanism for VMMaker since this would mean replicating code from InterpreterPlugin; waiting for a more elegant solution to appear. In the meantime this means that this plugin will always get regenerated even if the file is uptodate" | cg | self initialize. cg := self buildCodeGeneratorUpTo: InterpreterPlugin. cg addMethodsForPrimitives: ADPCMCodec translatedPrimitives. inlineFlag ifTrue:[ "now remove a few which will be inlined but not pruned" cg pruneMethods: #(indexForDeltaFrom:to: nextBits: nextBits:put:)]. + self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory asFileReference / (self moduleName, '.c')) fullName. - self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory asFileReference / self moduleName, '.c') fullName. ^cg exportedPrimitiveNames asArray ! Item was changed: ----- Method: SoundGenerationPlugin class>>translateInDirectory:doInlining: (in category 'accessing') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case code string rather than generated code. NB sqOldSoundsPrims IS NOT FULLY INTEGRATED - it still isn't included in the exports list" | cg | self initialize. cg := self buildCodeGeneratorUpTo: InterpreterPlugin. cg addMethodsForPrimitives: AbstractSound translatedPrimitives. + self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory asFileReference / (self moduleName, '.c')) fullName. - self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory asFileReference / self moduleName, '.c') fullName. "What we need here is some way to derive the prim names from sqOldSoundPrims - or dump it entirely. Perhaps add this class (without then generating the file again) using fake entry points like SurfacePlugin does" ^cg exportedPrimitiveNames asArray !

1 0

VM Maker: VMMaker-oscog-GuillermoPolito.241.mcz
by commits＠source.squeak.org 19 Jun '13

19 Jun '13

Guillermo Polito uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-GuillermoPolito.241.mcz ==================== Summary ==================== Name: VMMaker-oscog-GuillermoPolito.241 Author: GuillermoPolito Time: 17 June 2013, 6:37:02.254 pm UUID: b67733cc-447a-478d-b979-eb90acc9e04f Ancestors: VMMaker-oscog-GuillermoPolito.240 moving to use filesystem =============== Diff against VMMaker-oscog-GuillermoPolito.240 =============== Item was changed: ----- Method: ADPCMCodecPlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case code string rather than generated code" "Not currently hooked into the timeStamp mechanism for VMMaker since this would mean replicating code from InterpreterPlugin; waiting for a more elegant solution to appear. In the meantime this means that this plugin will always get regenerated even if the file is uptodate" | cg | self initialize. cg := self buildCodeGeneratorUpTo: InterpreterPlugin. cg addMethodsForPrimitives: ADPCMCodec translatedPrimitives. inlineFlag ifTrue:[ "now remove a few which will be inlined but not pruned" cg pruneMethods: #(indexForDeltaFrom:to: nextBits: nextBits:put:)]. + self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory asFileReference / self moduleName, '.c') fullName. - self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory fullNameFor: self moduleName, '.c'). ^cg exportedPrimitiveNames asArray ! Item was changed: ----- Method: CrossPlatformVMMaker>>interpreterExportsFilePath (in category 'generate sources') ----- interpreterExportsFilePath "Return the full path for the interpreter exports file. Since we're leaving it up to platform makefiles to specify the actual named prims, just produce an example file." + ^(self coreVMDirectory / 'exampleSqNamedPrims.h') fullPath! - ^self coreVMDirectory fullNameFor: 'exampleSqNamedPrims.h'! Item was changed: ----- Method: FilePluginSimulator>>sqFileRenameOld:Size:New:Size: (in category 'simulation') ----- sqFileRenameOld: oldNameIndex Size: oldNameSize New: newNameIndex Size: newNameSize | oldPath newPath | + oldPath := (interpreterProxy interpreter asString: oldNameIndex size: oldNameSize) asFileReference fullName. + newPath := (interpreterProxy interpreter asString: newNameIndex size: newNameSize) asFileReference fullName. - oldPath := FileSystem workingDirectory fullNameFor: (interpreterProxy interpreter asString: oldNameIndex size: oldNameSize). - newPath := FileSystem workingDirectory fullNameFor: (interpreterProxy interpreter asString: newNameIndex size: newNameSize). ((StandardFileStream isAFileNamed: oldPath) and: [(StandardFileStream isAFileNamed: newPath) not]) ifFalse: [^interpreterProxy primitiveFail]. [FileSystem workingDirectory primRename: oldPath to: newPath] on: Error do: [:ex| interpreterProxy primitiveFail]! Item was changed: ----- Method: Gnuifier>>gnuify (in category 'as yet unclassified') ----- gnuify "This Gnuifier produces a file compatible with gcc 3.x and gcc 4.x. We label the gnuified VM so one can identify the valid gcc version. The script run on Wndows, platforms/win32/misc/gnuify, produces something compatible with gcc 2.95 (gack)." + (directory asFileReference / ('gcc3x-', interpreterFilename)) ensureDeleted. - (directory fileExists: 'gcc3x-', interpreterFilename) ifTrue: - [directory deleteFileNamed: 'gcc3x-', interpreterFilename]. self + gnuifyFrom: (FileStream oldFileNamed: (directory asFileReference / interpreterFilename) fullName) + to: (VMMaker forceNewFileNamed: (directory asFileReference / 'gcc3x-', interpreterFilename) fullName ) - gnuifyFrom: (directory oldFileNamed: interpreterFilename) - to: (VMMaker forceNewFileNamed: (directory fullNameFor: 'gcc3x-', interpreterFilename)) ! Item was changed: ----- Method: InterpreterPlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "This is the default method for writing out sources for a plugin. Several classes need special handling, so look at all implementors of this message" + | cg fname fstat reference | - | cg fname fstat | fname := self moduleName, '.c'. "don't translate if the file is newer than my timeStamp" + reference := directory asFileReference / name. + fstat := reference exists ifTrue: [ reference entry ] ifFalse: [nil]. - fstat := directory entryAt: fname ifAbsent:[nil]. fstat ifNotNil: [((self pluginClassesUpTo: self) allSatisfy: [ :aPluginClass| aPluginClass timeStamp < fstat modificationTime asSeconds ]) ifTrue: [^nil]]. self initialize. cg := self buildCodeGeneratorUpTo: self. + cg storeCodeOnFile: (directory asFileReference / fname) fullName doInlining: inlineFlag. - cg storeCodeOnFile: (directory fullNameFor: fname) doInlining: inlineFlag. ^cg exportedPrimitiveNames asArray! Item was changed: ----- Method: MiscPrimitivePlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case code string rather than normal generated code." + | cg fname fstat reference | - | cg fname fstat | fname := self moduleName, '.c'. + reference := directory asFileReference / fname. + fstat := reference exists ifTrue: [ reference entry ] ifFalse: [nil]. - "don't translate if the file is newer than my timeStamp" - fstat := directory entryAt: fname ifAbsent:[nil]. fstat ifNotNil:[self timeStamp < fstat modificationTime asSeconds ifTrue:[^nil]]. self initialize. cg := self buildCodeGeneratorUpTo: InterpreterPlugin. cg addMethodsForPrimitives: self translatedPrimitives. + self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory asFileReference / fname) fullName. - self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory fullNameFor: fname). ^cg exportedPrimitiveNames asArray ! Item was changed: ----- Method: RiscOSVMMaker class>>generateSqueakStackVM (in category 'configurations') ----- generateSqueakStackVM "RISC OS version; build needed plugins, make sure filename tweaking is used" "RiscOSVMMaker generateSqueakStackVM" ^self generate: StackInterpreter + to: 'stacksrc' asFileReference fullName + platformDir: 'platforms' asFileReference fullName - to: (FileSystem workingDirectory directoryNamed: 'stacksrc') fullName - platformDir: (FileSystem workingDirectory directoryNamed: 'platforms') fullName excluding: #(AsynchFilePlugin BrokenPlugin CroquetPlugin FFIPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin JoystickTabletPlugin MIDIPlugin MacMenubarPlugin Mpeg3Plugin NewsqueakIA32ABIPlugin QuicktimePlugin SerialPlugin TestOSAPlugin ThreadedARMFFIPlugin ThreadedFFIPlugin ThreadedIA32FFIPlugin ThreadedPPCBEFFIPlugin UUIDPlugin VMProfileMacSupportPlugin)! Item was changed: ----- Method: RiscOSVMMaker>>export:forExternalPlugin: (in category 'generate sources') ----- export: exportList forExternalPlugin: aPlugin "it may be useful on certain platforms to do something with the export list of external plugins, just as the internal plugins' exports get added to the VM list. Default is to do nothing though." "For RiscOS using the 'rink' external linker each plugin needs a 'dsc' file that looks like id:SqueakSO main_version:100 code_version:001 entries: // named_entries: getModuleName // with all the exported names in the list. We also need a '/o' directory for the object files" "open a file called plugindir/pluginname.dsc and write into it" | f fd dfd | + fd := (self externalPluginsDirectoryFor: aPlugin) asFileReference. - fd := self externalPluginsDirectoryFor: aPlugin. "If we get an error to do with opening the .dsc file, we need to raise an application error to suit" + [(fd / 'dsc') isDirectory ifFalse: [(fd / 'dsc') ensureDirectory]. + dfd := fd / 'dsc'. - [(fd directoryExists: 'dsc') ifFalse:[fd createDirectory: 'dsc']. - dfd := fd directoryNamed: 'dsc'. f := VMMaker forceNewFileNamed: (dfd fullNameFor: aPlugin moduleName)] on: FileStreamException do:[^self couldNotOpenFile: (dfd fullNameFor: aPlugin moduleName)]. f nextPutAll: 'id:SqueakSO main_version:100 code_version:001 entries: // named_entries: '. exportList do:[:el| f nextPutAll: el. f cr]. f nextPutAll: '//'; cr. f close. + (fd / 'o') assureExistence - (fd directoryNamed: 'o') assureExistence ! Item was changed: ----- Method: RiscOSVMMaker>>needsToRegenerateInterpreterFile (in category 'initialize') ----- needsToRegenerateInterpreterFile "check the timestamp for the relevant classes and then the timestamp for the interp.c file if it already exists. Return true if the file needs regenerating, false if not" + | tStamp fstat reference | - | tStamp fstat | tStamp := (self interpreterClass withAllSuperclasses copyUpTo: ObjectMemory superclass), self interpreterClass ancilliaryClasses inject: 0 into: [:tS :cl| tS max: cl timeStamp]. "don't translate if the file is newer than my timeStamp" "RiscOS keeps the interp file in a 'c' subdirectory of coreVMDirectory" (self coreVMDirectory directoryExists: 'c') ifFalse:[^true]. + reference := self coreVMDirectory asFileReference / 'c' / self interpreterFilename. + fstat := reference exists ifTrue: [ reference entry ] ifFalse: [nil]. - fstat := (self coreVMDirectory directoryNamed: 'c') entryAt: self interpreterFilename ifAbsent:[nil]. fstat ifNotNil:[tStamp < fstat modificationTime ifTrue:[^false]]. ^true ! Item was changed: ----- Method: SoundGenerationPlugin class>>translateInDirectory:doInlining: (in category 'accessing') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case code string rather than generated code. NB sqOldSoundsPrims IS NOT FULLY INTEGRATED - it still isn't included in the exports list" | cg | self initialize. cg := self buildCodeGeneratorUpTo: InterpreterPlugin. cg addMethodsForPrimitives: AbstractSound translatedPrimitives. + self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory asFileReference / self moduleName, '.c') fullName. - self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory fullNameFor: self moduleName, '.c'). "What we need here is some way to derive the prim names from sqOldSoundPrims - or dump it entirely. Perhaps add this class (without then generating the file again) using fake entry points like SurfacePlugin does" ^cg exportedPrimitiveNames asArray ! Item was changed: ----- Method: VMMaker class>>generateSqueakStackVM (in category 'configurations') ----- generateSqueakStackVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter + to: 'oscogvm/stacksrc' asFileReference fullName + platformDir: 'oscogvm/platforms' asFileReference fullName - to: (FileSystem workingDirectory directoryNamed: 'oscogvm/stacksrc') fullName - platformDir: (FileSystem workingDirectory directoryNamed: 'oscogvm/platforms') fullName excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! Item was changed: ----- Method: VMMaker>>coreVMDirectory (in category 'target directories') ----- coreVMDirectory "return the target directory for the main VM sources, interp.c etc" | fd | + fd := self sourceDirectory / self class coreVMDirName. + fd ensureDirectory. - fd := self sourceDirectory directoryNamed: self class coreVMDirName. - fd assureExistence. ^ fd! Item was changed: ----- Method: VMMaker>>crossPlatformDirectory (in category 'source directories') ----- crossPlatformDirectory "return the directory where we should find the cross-platform literal sources - <sq.h> etc" | fd machDirNm | + fd := self platformRootDirectory asFileReference. + (fd / (machDirNm := 'Cross')) exists - fd := self platformRootDirectory. - (fd directoryExists: (machDirNm := 'Cross')) ifFalse: ["The supposed directory for the actual cross-platform code does not exist." ^ self couldNotFindPlatformDirectoryFor: 'cross-platform ']. + ^ fd / machDirNm! - ^ fd directoryNamed: machDirNm! Item was changed: ----- Method: VMMaker>>crossPlatformPluginsDirectory (in category 'source directories') ----- crossPlatformPluginsDirectory "return the directory where we should find the cross-platform plugin specific sources" + (self crossPlatformDirectory / self class pluginsDirName) exists - (self crossPlatformDirectory directoryExists: self class pluginsDirName) ifFalse: ["The supposed directory for the plugins code does not exist. We need to raise a suitable exception, but cant think of one right now." ^self couldNotFindPlatformDirectoryFor: 'any plugins needing cross-platform']. + ^self crossPlatformDirectory / self class pluginsDirName! - ^self crossPlatformDirectory directoryNamed: self class pluginsDirName! Item was changed: ----- Method: VMMaker>>externalPluginsDirectory (in category 'target directories') ----- externalPluginsDirectory "return the target directory for the external plugins sources" | fd | + fd := self sourceDirectory / self class pluginsDirName. + fd ensureDirectory. - fd := self sourceDirectory directoryNamed: self class pluginsDirName. - fd assureExistence. ^fd! Item was changed: ----- Method: VMMaker>>externalPluginsDirectoryFor: (in category 'target directories') ----- externalPluginsDirectoryFor: plugin "return the directory for the external plugin sources" |fd| + fd := self externalPluginsDirectory / plugin moduleName. + fd ensureDirectory. - fd := self externalPluginsDirectory directoryNamed: plugin moduleName. - fd assureExistence. ^fd! Item was changed: ----- Method: VMMaker>>generateCogitFile (in category 'generate sources') ----- generateCogitFile "Translate the Smalltalk description of the virtual machine into C. If 'self doInlining' is true, small method bodies are inlined to reduce procedure call overhead. On the PPC, this results in a factor of three speedup with only 30% increase in code size. Subclasses can use specialised versions of CCodeGenerator and interpreterClass." | cg cogitClass | self interpreterClass needsCogit ifFalse: [^nil]. cg := [self buildCodeGeneratorForCogit] on: Notification do: [:ex| ex tag == #getVMMaker ifTrue: [ex resume: self] ifFalse: [(ex respondsTo: #rearmHandlerDuring:) ifTrue: [ex rearmHandlerDuring: [ex pass]] ifFalse: [ex pass]]]. self needsToRegenerateCogitFile ifFalse: [^nil]. cogitClass := self cogitClass. cg removeUnneededBuiltins. cg vmClass preGenerationHook: cg. cg storeCodeOnFile: (self sourceFilePathFor: cogitClass sourceFileName) doInlining: cogitClass doInlining. cg vmClass additionalHeadersDo: [:headerName :headerContents| | filePath | + filePath := (self coreVMDirectory / headerName) fullName. - filePath := self coreVMDirectory fullNameFor: headerName. (cg needToGenerateHeader: headerName file: filePath contents: headerContents) ifTrue: [cg storeHeaderOnFile: filePath contents: headerContents]]. cogitClass apiExportHeaderName ifNotNil: [cg storeAPIExportHeader: cogitClass apiExportHeaderName OnFile: (self sourceFilePathFor: cogitClass apiExportHeaderName)]! Item was changed: ----- Method: VMMaker>>generateInterpreterFile (in category 'generate sources') ----- generateInterpreterFile "Translate the Smalltalk description of the virtual machine into C. If 'self doInlining' is true, small method bodies are inlined to reduce procedure call overhead. On the PPC, this results in a factor of three speedup with only 30% increase in code size. Subclasses can use specialised versions of CCodeGenerator and interpreterClass." | cg vmHeaderContents | cg := [self buildCodeGeneratorForInterpreter] on: Notification do: [:ex| ex tag == #getVMMaker ifTrue: [ex resume: self] ifFalse: [(ex respondsTo: #rearmHandlerDuring:) ifTrue: [ex rearmHandlerDuring: [ex pass]] ifFalse: [ex pass]]]. self needsToRegenerateInterpreterFile ifFalse: [^nil]. cg removeUnneededBuiltins. self interpreterClass preGenerationHook: cg. vmHeaderContents := cg vmHeaderContentsWithBytesPerWord: self bytesPerWord. (cg needToGenerateHeader: self interpreterHeaderName file: self interpreterHeaderPath contents: vmHeaderContents) ifTrue: [cg storeHeaderOnFile: self interpreterHeaderPath contents: vmHeaderContents]. cg storeCodeOnFile: (self sourceFilePathFor: self interpreterClass sourceFileName) doInlining: self doInlining. self interpreterClass additionalHeadersDo: [:headerName :headerContents| | filePath | + filePath := (self coreVMDirectory asFileReference / headerName) fullName. - filePath := self coreVMDirectory fullNameFor: headerName. (cg needToGenerateHeader: headerName file: filePath contents: headerContents) ifTrue: [cg storeHeaderOnFile: filePath contents: headerContents]]. self interpreterClass apiExportHeaderName ifNotNil: [cg storeAPIExportHeader: self interpreterClass apiExportHeaderName OnFile: (self sourceFilePathFor: self interpreterClass apiExportHeaderName)]. self gnuifyInterpreterFile! Item was changed: ----- Method: VMMaker>>internalPluginsDirectory (in category 'target directories') ----- internalPluginsDirectory "return the directory for the internal plugins sources" |fd| + fd := self coreVMDirectory / 'intplugins'. + fd ensureDirectory. - fd := self coreVMDirectory directoryNamed: 'intplugins'. - fd assureExistence. ^fd! Item was changed: ----- Method: VMMaker>>internalPluginsDirectoryFor: (in category 'target directories') ----- internalPluginsDirectoryFor: plugin "return the directory for the internal plugin sources" |fd| + fd := self internalPluginsDirectory / plugin moduleName. + fd ensureDirectory. - fd := self internalPluginsDirectory directoryNamed: plugin moduleName. - fd assureExistence. ^fd! Item was changed: ----- Method: VMMaker>>interpreterExportsFilePath (in category 'generate sources') ----- interpreterExportsFilePath "return the full path for the interpreter exports file" + ^(self coreVMDirectory / 'sqNamedPrims.h') fullPath! - ^self coreVMDirectory fullNameFor: 'sqNamedPrims.h'! Item was changed: ----- Method: VMMaker>>interpreterHeaderPath (in category 'generate sources') ----- interpreterHeaderPath "Answer the fully-qualified path for the generated interpreter header file." + ^(self coreVMDirectory / self interpreterHeaderName) fullPath! - ^self coreVMDirectory fullNameFor: self interpreterHeaderName! Item was changed: ----- Method: VMMaker>>needsToRegenerateCogitFile (in category 'generate sources') ----- needsToRegenerateCogitFile "check the timestamp for the relevant classes and then the timestamp for the interp.c file if it already exists. Return true if the file needs regenerating, false if not" + | cogitClass cogitClasses tStamp fstat reference | - | cogitClass cogitClasses tStamp fstat | cogitClass := self cogitClass. cogitClasses := cogitClass withAllSuperclasses copyUpThrough: Cogit. cogitClasses addAllLast: cogitClass ancilliaryClasses. tStamp := cogitClasses inject: 0 into: [:tS :cl| tS max: cl timeStamp]. cogitClasses do: [:c| tStamp := c ancilliaryStructClasses inject: tStamp into: [:tS :cl| tS max: cl timeStamp]]. "don't translate if the file is newer than my timeStamp" + reference := self coreVMDirectory asFileReference / cogitClass sourceFileName. + fstat := reference exists ifTrue: [ reference entry ] ifFalse: [nil]. - fstat := self coreVMDirectory entryAt: cogitClass sourceFileName ifAbsent:[nil]. fstat ifNotNil:[ tStamp < fstat modificationTime asSeconds ifTrue: [^self confirm: 'The ', cogitClass printString, ' classes have not been modified since\ the source file was last generated.\Do you still want to regenerate it?' withCRs]]. ^true ! Item was changed: ----- Method: VMMaker>>needsToRegenerateInterpreterFile (in category 'initialize') ----- needsToRegenerateInterpreterFile "check the timestamp for the relevant classes and then the timestamp for the interp.c file if it already exists. Return true if the file needs regenerating, false if not" + | classes tStamp fstat reference | - | classes tStamp fstat | classes := self interpreterClass withAllSuperclasses copyUpTo: VMClass. self interpreterClass objectMemoryClass ifNotNil: [:objectMemoryClass| classes addAllLast: (objectMemoryClass withAllSuperclasses copyUpTo: VMClass)]. classes copy do: [:class| classes addAllLast: class ancilliaryClasses]. classes copy do: [:class| classes addAllLast: class ancilliaryStructClasses]. tStamp := classes inject: 0 into: [:tS :cl| tS max: cl timeStamp]. "don't translate if the file is newer than my timeStamp" + reference := self coreVMDirectory asFileReference / self interpreterFilename. + fstat := reference exists ifTrue: [ reference entry ] ifFalse: [nil]. - fstat := self coreVMDirectory entryAt: self interpreterFilename ifAbsent:[nil]. fstat ifNotNil:[ tStamp < fstat modificationTime asSeconds ifTrue: [^self confirm: 'The interpreter classes have not been modified since\ the interpreter file was last generated.\Do you still want to regenerate their source file?' withCRs]]. ^true ! Item was changed: ----- Method: VMMaker>>platformDirectories (in category 'target directories') ----- platformDirectories | root | ^((root := self platformRootDirectory) directoryNames reject: [:dirName| dirName first = $. ".svn .git et al" or: [dirName ='CVS']]) collect: [:dirName| + root / dirName]! - root directoryNamed: dirName]! Item was changed: ----- Method: VMMaker>>platformDirectory (in category 'source directories') ----- platformDirectory "return the directory where we should find the platform specific sources" | fd platNm | + fd := self platformRootDirectory asFileReference. + (fd / (platNm := self platformName)) exists - fd := self platformRootDirectory. - (fd directoryExists: (platNm := self platformName)) ifFalse: ["The supposed directory for the actual platform code does not exist." ^ self couldNotFindPlatformDirectoryFor: platNm]. + ^ fd / platNm! - ^ fd directoryNamed: platNm! Item was changed: ----- Method: VMMaker>>platformPluginsDirectories (in category 'target directories') ----- platformPluginsDirectories ^self platformDirectories + select: [:dir| (dir / self class pluginsDirName) exists] + thenCollect: [:dir| (dir / self class pluginsDirName) exists]! - select: [:dir| dir directoryExists: self class pluginsDirName] - thenCollect: [:dir| dir directoryNamed: self class pluginsDirName]! Item was changed: ----- Method: VMMaker>>platformPluginsDirectory (in category 'source directories') ----- platformPluginsDirectory "return the directory where we should find the platform plugin specific sources" (self platformDirectory directoryExists: self class pluginsDirName) ifFalse: ["The supposed directory for the plugins code does not exist. We need to raise a suitable exception, but cant think of one right now." ^self couldNotFindPlatformDirectoryFor: 'any plugins needing ', self platformName]. + ^self platformDirectory / self class pluginsDirName! - ^self platformDirectory directoryNamed: self class pluginsDirName! Item was changed: ----- Method: VMMaker>>platformRootDirectory (in category 'source directories') ----- platformRootDirectory "return the directory where we should find all platform's sources" (platformRootDirName ifNil: [ self class platformsDirName ]) asFileReference isDirectory ifFalse: [ "The supposed directory for the platforms code does not exist." ^ self couldNotFindDirectory: 'the platform code tree' ]. + ^ (platformRootDirName ifNil: [ self class platformsDirName ]) fullName! - ^ FileSystem workingDirectory directoryNamed: (platformRootDirName ifNil: [ self class platformsDirName ])! Item was changed: ----- Method: VMMaker>>sourceDirectory (in category 'target directories') ----- sourceDirectory | fd | + fd := (sourceDirName ifNil: [self class sourceDirName, self vmBitnessString]) asFileReference. + fd ensureDirectory. - fd := FileSystem workingDirectory directoryNamed: (sourceDirName - ifNil: [self class sourceDirName, self vmBitnessString]). - fd assureExistence. ^ fd! Item was changed: ----- Method: VMMaker>>sourceFilePathFor: (in category 'generate sources') ----- sourceFilePathFor: sourceFileName "Answer the fully-qualified path for the generated source file." + ^(self coreVMDirectory / sourceFileName) fullName! - ^self coreVMDirectory fullNameFor: sourceFileName! Item was changed: ----- Method: VMMaker>>storeExternalPluginList (in category 'exports') ----- storeExternalPluginList | contents filePath fileStream | contents := String streamContents: [:s| s nextPutAll:'# Automatically generated makefile include for external plugins'. s cr; nextPutAll:'EXTERNAL_PLUGINS ='. self externalPluginsDo: [:cls| s space; nextPut: $\; cr; nextPutAll: cls moduleName]. s cr]. + filePath := self makefileDirectory / self externalPluginListName. - filePath := self makefileDirectory fullNameFor: self externalPluginListName. (CCodeGenerator basicNew needToGenerateHeader: filePath file: filePath contents: contents) ifTrue: [[fileStream := VMMaker forceNewFileNamed: filePath] on: FileDoesNotExistException do:[^self couldNotOpenFile: filePath]. fileStream nextPutAll: contents; close]! Item was changed: ----- Method: VMMaker>>storeInternalPluginList (in category 'exports') ----- storeInternalPluginList | contents filePath fileStream | contents := String streamContents: [:s| s nextPutAll:'# Automatically generated makefile include for internal plugins'. s cr; nextPutAll:'INTERNAL_PLUGINS ='. self internalPluginsDo: [:cls| s space; nextPut: $\; cr; nextPutAll: cls moduleName]. s cr]. + filePath := self makefileDirectory / self internalPluginListName. - filePath := self makefileDirectory fullNameFor: self internalPluginListName. (CCodeGenerator basicNew needToGenerateHeader: filePath file: filePath contents: contents) ifTrue: [[fileStream := VMMaker forceNewFileNamed: filePath] on: FileDoesNotExistException do:[^self couldNotOpenFile: filePath]. fileStream nextPutAll: contents; close]! Item was changed: ----- Method: VMMakerTool>>findPlatformsPathFrom:informing: (in category 'path access') ----- findPlatformsPathFrom: fd informing: bar | dirNames possiblePath | bar value: 'Searching in ', fd pathName. dirNames := fd directoryNames. (dirNames includes: 'platforms') ifTrue:[ possiblePath := fd pathName, fd pathNameDelimiter asString, 'platforms'. (self confirm: 'Found a platforms directory at ', possiblePath,' Do you want me to use it?') ifTrue:[^possiblePath]. ]. dirNames do:[:dd| + possiblePath := self findPlatformsPathFrom: (fd asFileReference / dd) fullName informing: bar. - possiblePath := self findPlatformsPathFrom: (fd directoryNamed: dd) informing: bar. possiblePath ifNotNil:[^possiblePath]. ]. ^nil!

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev June 2013