Vm-dev December 2014

vm-dev@lists.squeakfoundation.org

33 participants
160 discussions

VM Maker: VMMaker.oscog-eem.964.mcz
by commits＠source.squeak.org 04 Dec '14

04 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.964.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.964 Author: eem Time: 4 December 2014, 1:07:52.227 pm UUID: c27b9d18-c73d-48e3-a63a-3e4b3f14c7ab Ancestors: VMMaker.oscog-eem.963 Make the return type of safeObjectAfter: stable and consistent with that of objectAfter: =============== Diff against VMMaker.oscog-eem.963 =============== Item was changed: ----- Method: NewObjectMemory>>safeObjectAfter: (in category 'object enumeration') ----- safeObjectAfter: oop "Return the object or start of free space immediately following the given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only." | sz | (self isFreeObject: oop) ifTrue: [sz := self sizeOfFree: oop] ifFalse: [sz := self sizeBitsOf: oop]. ^(oop + sz) asUnsignedInteger >= freeStart + ifTrue: [freeStart asInteger] - ifTrue: [freeStart] ifFalse: [self oopFromChunk: oop + sz]!

1 0

VM Maker: VMMaker.oscog-eem.963.mcz
by commits＠source.squeak.org 04 Dec '14

04 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.963.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.963 Author: eem Time: 4 December 2014, 12:00:39.246 pm UUID: 9df56221-18fd-4dcd-b93f-ae000bef62e5 Ancestors: VMMaker.oscog-eem.962 Fix SmartSyntaxPlugin code generation for Spur of - asOop: old code assumed 4 byte oops & headers - Unsigned old code assumed 32-bit oops Fix Float class>>ccgCanConvertFrom: to use isFloat Avoid duplication of effort in special selector send forwarding fault handling. =============== Diff against VMMaker.oscog-eem.962 =============== Item was changed: ----- Method: Float class>>ccgCanConvertFrom: (in category '*VMMaker-plugin generation') ----- ccgCanConvertFrom: anObject + ^anObject isFloat! - ^anObject class == self! Item was changed: ----- Method: SmartSyntaxPluginCodeGenerator>>ccgLoad:expr:asUnsignedValueFrom: (in category 'coercing') ----- ccgLoad: aBlock expr: aString asUnsignedValueFrom: anInteger "Answer a codestring for positive integer coercion (with validating side-effect) of oop, as described in comment to ccgLoad:expr:asRawOopFrom:" + ^aBlock value: (String streamContents: [:aStream | + aStream + nextPutAll: '(interpreterProxy bytesPerOop = 4'; + crtab: 2; + nextPutAll: 'ifTrue: [interpreterProxy positive32BitValueOf:'; + crtab: 4; + nextPutAll: '(interpreterProxy stackValue:'; + print: anInteger; + nextPutAll: ')]'; + crtab: 2; + nextPutAll: 'ifFalse: [interpreterProxy positive64BitValueOf:'; + crtab: 4; + nextPutAll: '(interpreterProxy stackValue:'; + print: anInteger; + nextPutAll: ')])'])! - ^aBlock value: (String streamContents: [:aStream | aStream - nextPutAll: 'interpreterProxy positive32BitValueOf:'; - crtab: 2; - nextPutAll: '(interpreterProxy stackValue:'; - nextPutAll: anInteger asString; - nextPutAll: ')'])! Item was changed: ----- Method: SmartSyntaxPluginCodeGenerator>>generateCoerceToObjectFromPtr:on: (in category 'asOop:/asValue:') ----- generateCoerceToObjectFromPtr: aNode on: aStream "This code assumes no named instance variables" + aStream nextPutAll: '((sqInt)(('. - aStream nextPutAll: '((int) '. self emitCExpression: aNode on: aStream. + aStream nextPutAll: ') - BaseHeaderSize))'! - aStream nextPutAll: ') - 4'! Item was changed: ----- Method: StackInterpreter>>handleSpecialSelectorSendFaultFor:fp:sp: (in category 'message sending') ----- handleSpecialSelectorSendFaultFor: obj fp: theFP sp: theSP "Handle a special send fault that may be due to a special selector + send accessing a forwarded object. obj is forwarded. + Unforward stack contents and and inst vars and answer obj's target." - send accessing a forwarded object. - Unforward the object on the stack and in inst vars and answer its target." <inline: false> <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> + | rcvr | self assert: (objectMemory isOopForwarded: obj). - self followForwardedFrameContents: theFP stackPointer: theSP. + rcvr := self frameReceiver: theFP. + (objectMemory isPointers: rcvr) ifTrue: - (objectMemory isPointers: (self frameReceiver: theFP)) ifTrue: [objectMemory + followForwardedObjectFields: rcvr - followForwardedObjectFields: (self frameReceiver: theFP) toDepth: 0]. ^objectMemory followForwarded: obj!

1 0

VM Maker: CMakeVMMakerSqueak-tty.96.mcz
by commits＠source.squeak.org 04 Dec '14

04 Dec '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.96.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.96 Author: tty Time: 4 December 2014, 11:54:31.236 am UUID: f627c6b0-637e-4c5d-96ba-2e30003d3bfe Ancestors: CMakeVMMakerSqueak-tty.95 postBuildActions converted to CMake Templates Test modified to support it. Now on to plugins converted to CMake templates =============== Diff against CMakeVMMakerSqueak-tty.95 =============== Item was added: + CMakeTemplate subclass: #CMakeAppendConfigHIn + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeCustomTemplates'! + + !CMakeAppendConfigHIn commentStamp: 'tty 12/4/2014 11:13' prior: 0! + A CMakeAppendConfigHIn looks like this: + + FOREACH (var ${config_vars}) + FILE (APPEND ${CMAKE_BINARY_DIR}/config.h.in "#cmakedefine ${var} @${var}@\n") + ENDFOREACH (var)'.! Item was added: + ----- Method: CMakeAppendConfigHIn>>initialize (in category 'initialize-release') ----- + initialize + self content:' + FOREACH (var ${config_vars}) + FILE (APPEND ${CMAKE_BINARY_DIR}/config.h.in "#cmakedefine ${var} @${var}@\n") + ENDFOREACH (var)'. + ! Item was added: + CMakeTemplate subclass: #CMakeAppendConfigStatus + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeCustomTemplates'! + + !CMakeAppendConfigStatus commentStamp: 'tty 12/4/2014 11:27' prior: 0! + A CMakeAppendConfigStatus looks like this: + + FILE (WRITE ${CMAKE_BINARY_DIR}/config.status "") + FOREACH (var ${tmp}) + FILE (APPEND ${CMAKE_BINARY_DIR}/config.status "${var}=${${var}}\n") + ENDFOREACH ()' + ! Item was added: + ----- Method: CMakeAppendConfigStatus>>initialize (in category 'initialize-release') ----- + initialize + self content:' + FOREACH (var ${config_vars}) + FILE (APPEND ${CMAKE_BINARY_DIR}/config.h.in "#cmakedefine ${var} @${var}@\n") + ENDFOREACH (var)'. + ! Item was added: + CMakeTemplate subclass: #CMakeCommand + instanceVariableNames: 'command params' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeCommand commentStamp: '<historical>' prior: 0! + A CMakeSetTemplate 's contents look like + + + CONFIG_DEFINE (SQ_VERSION) + + + CONFIG_DEFINE is a Macro Ian Piumarta wrote that looks like this: + + MACRO (CONFIG_DEFINE var) + LIST (APPEND config_vars "${var}") + ENDMACRO (CONFIG_DEFINE var) + + You can see it in CPlatformConfigForSqueak class utilsCMake + + ! Item was added: + ----- Method: CMakeCommand>>command:params: (in category 'accessing') ----- + command: cString params: pString + command:=cString. + params:=pString. + self content: command,'(', params ,')' + + ! Item was added: + ----- Method: CMakeCommand>>initialize (in category 'initialize-release') ----- + initialize + command:='foo'. + params:='bar'. + self content: command,'(', params ,')'! Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>generateByTemplate (in category 'code generation') ----- generateByTemplate "attempt to move way from string based writing to template based. Think Seaside renderOn composition" | extPlugins intPlugins | self flag: 'tty'. "refactor so that the cascade reflects CMake terminilogy" + output := String new writeStream. config templates: OrderedCollection new. config setGlobalOptions: self; cmakePrefixPath; cmakeIncludePath; cmakeLibraryPath; + cmakeIncludeModules; - cmakeIncludeModules; cmakeCFlags; cmakeAddDefinitions; cmakeWriteDirectoriesDotCmake: self; cmakeIncludeDirectories: self; "<---" preferredIncludes; "<---why 3 of em?" standardIncludes; "<---" setGlobalOptionsAfterDetermineSystem: self; extraVMSettings: self; "<--catch-all method. os/platform specific" setCoreSources: self; setPlatformSources: self; setCrossSources: self; setExtraSources; cmakeSetSourceFilesProperties; cmakeListAppend:'LINKLIBS' elements: (config externalLibs); cmakeAddExecutableNameOptionSource: self; setExecutableOutputPath; addVMPlugins: self. config templates do: [:each | self puts: each content]. + config templates: OrderedCollection new. extPlugins := self generatePluginConfigs: config internalPlugins internal: true. intPlugins := self generatePluginConfigs: config externalPlugins internal: false. + self processThirdpartyLibraries. "<--unused in Pharo code? What exactly does this do?" - self processThirdpartyLibraries. self processPlugins: intPlugins, extPlugins. + self config templates addLast:((CMakeCommand new) command:'target_link_libraries' params:(self moduleName , ' ${LINKLIBS}')). + " self cmd: 'target_link_libraries' + params: self moduleName , ' ${LINKLIBS}'." - self cmd: 'target_link_libraries' - params: self moduleName , ' ${LINKLIBS}'. config postBuildActions: self.. + config templates do: [:each | self puts: each content]. self saveFile. self generateBuildScript! Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>processPlugins: (in category 'as yet unclassified') ----- processPlugins: pluginGenerators | libs libDeps | libs := OrderedCollection new. libDeps := Dictionary new. + self break. pluginGenerators do: [:gen | gen doNotGenerate ifFalse: [ self puts: (gen configDotCMake at: (gen plugin name) ifAbsent:[gen configDotCmakeEmpty]). gen isInternal ifTrue: [ libs add: gen plugin moduleName ] ifFalse: [ "make main module to depend on external plugin, just to make sure it is built before main module built" self cmd: 'add_dependencies' params: config executableName, ' ' , gen plugin moduleName ]. gen externalDependencies ifNotEmpty: [ :deps | libDeps at: gen plugin moduleName put: (deps fold: [ :a :b | a, ' ', b ]) ]. self addSubdirectory: gen plugin moduleName ] ]. self cmd: 'target_link_libraries' params: config executableName , ' ' , (libs inject: '' into: [:res :ea | res, ' ' , ea ]). libDeps keysAndValuesDo: [ :moduleName :dependencies | self cmd: 'add_dependencies' params: moduleName, ' ', dependencies ]. self generateExportsH: libs.! Item was changed: ----- Method: CMakeVMMakerSqueakRedirectMethodsWithArgTest>>testSetPostBuildActions (in category 'as yet unclassified') ----- testSetPostBuildActions + self flag:'tty'. "This test will probably fail if the oscogvm/cmake.build.xzy/language.vm.memorymanager/buildtype/ directory is not in place" - self flag:'tty'. "Is the self shouldnt sufficient?" #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) do:[:each | (Smalltalk at:each) allSubclassesDo:[:configuration | | o buildTypes vmGenerator| o:= configuration basicNew. (o excludeFromBuild not) & (configuration isAbstractBaseClass not) ifTrue:[ buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). buildTypes do:[:buildType | o configureForBuildType: buildType. + o enabledebugmessages: true. + o templates: OrderedCollection new. vmGenerator:=CMakeVMGeneratorForSqueak new. vmGenerator config: o. vmGenerator output:(String new writeStream). self shouldnt: [o postBuildActions: vmGenerator] raise: Error]]]]. ! Item was changed: ----- Method: CPlatformConfigForSqueak>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- postBuildActionsBuildAssert: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActions'" + self postBuildActionsBuild: aMaker - ^self postBuildActionsBuild: aMaker ! Item was changed: ----- Method: CPlatformConfigForSqueak>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- postBuildActionsBuildAssertITimerHeartbeat: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActions'" + self postBuildActionsBuild: aMaker - ^self postBuildActionsBuild: aMaker ! Item was changed: ----- Method: CPlatformConfigForSqueak>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- postBuildActionsBuildDebug: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActions'" + self postBuildActionsBuild: aMaker - ^self postBuildActionsBuild: aMaker ! Item was changed: ----- Method: CPlatformConfigForSqueak>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- postBuildActionsBuildDebugITimerHeartbeat: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActions'" + self postBuildActionsBuild: aMaker - ^self postBuildActionsBuild: aMaker ! Item was changed: ----- Method: CPlatformConfigForSqueak>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- postBuildActionsBuildITimerHeartbeat: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActions'" + self postBuildActionsBuild: aMaker - ^self postBuildActionsBuild: aMaker ! Item was changed: ----- Method: CPlatformConfigForSqueak>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- postBuildActionsBuildMultiThreaded: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActions'" + self postBuildActionsBuild: aMaker - ^self postBuildActionsBuild: aMaker ! Item was changed: ----- Method: CPlatformConfigForSqueak>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- postBuildActionsBuildMultiThreadedAssert: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActions'" + self postBuildActionsBuild: aMaker - ^self postBuildActionsBuild: aMaker ! Item was changed: ----- Method: CPlatformConfigForSqueak>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- postBuildActionsBuildMultiThreadedDebug: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActions'" + self postBuildActionsBuild: aMaker - ^self postBuildActionsBuild: aMaker ! Item was changed: ----- Method: Linux64x86w32BitConfig>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins + "developing template model for plugins one at a time" + ^ #() + ! - ^ #( - B3DAcceleratorPlugin - ThreadedIA32FFIPlugin "SqueakFFIPrims" - "UUIDPlugin" - "UnixOSProcessPlugin ?? " - JPEGReaderPlugin - JPEGReadWriter2Plugin - RePlugin - InternetConfigPlugin - ) - - "debug"! Item was changed: ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- postBuildActionsBuild: aMaker "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'" + (aMaker config enabledebugmessages) + ifTrue:[ + aMaker config templates + addLast: ((CMakeMessage new) message: (self class name), ' postBuildActionsBuild' ) + ]. + aMaker config templates + addLast: ((CMakeMessage new) message: 'postBuildActionsBuild: aMaker' ); + addLast:((CMakeCommand new) command:'include' params:'config.cmake'); "cmake --help-command include " + addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_DUPLICATES config_vars'); "cmake --help-command LIST" + addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.in ""'); "cmake --help-command FILE" + addLast:(CMakeAppendConfigHIn new); + addLast:((CMakeCommand new) command:'CONFIGURE_FILE' params:'${CMAKE_BINARY_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h'); + addLast:((CMakeCommand new) command:'GET_CMAKE_PROPERTY' params:'tmp VARIABLES'); + addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_ITEM tmp tmp'); + addLast:((CMakeCommand new) command:'LIST' params:'SORT tmp'); + addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.status ""'); + addLast:(CMakeAppendConfigStatus new). - aMaker message: 'postBuildActionsBuild: aMaker'. - aMaker include: 'config.cmake'. - "# CONFIGURE_PLUGINS" - aMaker cmd: 'LIST' params:'REMOVE_DUPLICATES config_vars'. - aMaker cmd: 'FILE' params: 'WRITE ${CMAKE_BINARY_DIR}/config.h.in ""'. - aMaker puts:' - FOREACH (var ${config_vars}) - FILE (APPEND ${CMAKE_BINARY_DIR}/config.h.in "#cmakedefine ${var} @${var}@\n") - ENDFOREACH (var)'. - aMaker cmd: 'CONFIGURE_FILE' params:'${CMAKE_BINARY_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h'. - "# INCLUDE(build.cmake) <--this tells me the config needs to be up higher - # BUILD PLUGINS - #ADD_SUBDIRECTORY (${unix}/npsqueak) - #SET (cmake ${unix}/../../cmake) - #IF (EXISTS ${cmake}/Packages.cmake) - # INCLUDE (${cmake}/Packages.cmake) - #ENDIF () - " - aMaker cmd: 'GET_CMAKE_PROPERTY' params: 'tmp VARIABLES'. - aMaker cmd: 'LIST' params: 'REMOVE_ITEM tmp tmp'. - aMaker cmd: 'LIST' params: 'SORT tmp'. - aMaker cmd: 'FILE' params: 'WRITE ${CMAKE_BINARY_DIR}/config.h.status ""'. - aMaker puts:' - FILE (WRITE ${CMAKE_BINARY_DIR}/config.status "") - FOREACH (var ${tmp}) - FILE (APPEND ${CMAKE_BINARY_DIR}/config.status "${var}=${${var}}\n") - ENDFOREACH ()' ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerDefinitions (in category 'compiling') ----- compilerDefinitions ^#( '-DNDEBUG' '-DDEBUGVM=0' ' -DLSB_FIRST=1' '-D_GNU_SOURCE' '-D_FILE_OFFSET_BITS=64' + " '-DUSE_GLOBAL_STRUCT=0'" - '-DUSE_GLOBAL_STRUCT=0' '-DCOGMTVM=0') ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlags (in category 'compiling') ----- compilerFlags ^#("'-Wall'" '-w' '-m32' '-msse2' + " '-g3' extra debugging info" - '-g3' "extra debugging info" '-O1' + " '-fno-caller-saves' + '-fno-tree-pre'") - '-fno-caller-saves' - '-fno-tree-pre') ! Item was changed: ----- Method: SqueakCMThirdpartyLibrary>>generateFor: (in category 'as yet unclassified') ----- generateFor: aVMGenerator | libDir stream contents | + self break. - vmGen := aVMGenerator. gen := CMakeGenerator new output: (String new writeStream). libDir := (aVMGenerator thirdpartyDir / self canonicalName) assureExistence. stream := String new writeStream. self generate. stream nextPutAll: (vmGen config fixLineEndsOf: gen output contents). contents := stream contents. (self isFile: (libDir / gen outputFileName) fullName hasContents: contents) ifFalse: [ "contents changed, update the file. Because fucking cmake will force rebuild everything if we change its modification date without changing its contents" (FileStream forceNewFileNamed: (libDir / gen outputFileName) pathName) nextPutAll: contents; close. ]. vmGen addSubdirectory: vmGen thirdpartyDirName , '/' , self canonicalName. self defineGlobalTargets. !

1 0

[commit][3158] CogVM source as per VMMaker.oscog-eem.962
by commits＠squeakvm.org 03 Dec '14

03 Dec '14

Revision: 3158 Author: eliot Date: 2014-12-03 14:25:05 -0800 (Wed, 03 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.962 Improve stack trace printing for Newspeak and Glue by providing something that assumes the penultimate literal is the selector or an AdditionalMethodState-like thing containing it. Fix StackInterpreter>>isFloatObject: and primitiveVMParameter to use isFloatInstance:. Reimplement primitiveCopyObject to work for both pointer and bits objects. This to support a good Object>>clone for Spur. Fix shortPrint: and simulated use of dbgFloatValueOf:, moving it to the ObjectMemory hierarchy. Fix Spur's isWordsOrBytes[NonImm]:. Old code answered true for CompiledMethods. Fix several type issues in the Mac VM when compiling as 64-bits. Switch the Mac HostWindowPlugin support code ffrom old deprecated to current HIView based support. Modified Paths: -------------- branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/Cross/vm/sqHeapMap.c branches/Cog/platforms/Mac OS/plugins/DropPlugin/sqMacDragDrop.c branches/Cog/platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c branches/Cog/platforms/Mac OS/plugins/HostWindowPlugin/sqMacHostWindow.c branches/Cog/platforms/Mac OS/plugins/HostWindowPlugin/sqMacHostWindow.h branches/Cog/platforms/Mac OS/plugins/InternetConfigPlugin/sqMacInternetConfiguration.c branches/Cog/platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities_External.h branches/Cog/platforms/Mac OS/plugins/MIDIPlugin/sqMacMIDI.c branches/Cog/platforms/Mac OS/plugins/SecurityPlugin/sqMacSecurity.c branches/Cog/platforms/Mac OS/vm/Developer/sqMacMinimal.c branches/Cog/platforms/Mac OS/vm/config.h branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/Mac OS/vm/sqMacTime.c branches/Cog/platforms/Mac OS/vm/sqMacTime.h branches/Cog/platforms/Mac OS/vm/sqMacUIClipBoard.c branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c branches/Cog/platforms/Mac OS/vm/sqMacWindowUniversal.c branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c branches/Cog/platforms/unix/vm/sqUnixVMProfile.c branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstack64src/vm/interp.h branches/Cog/spurstack64src/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-12-02 18:02:39 UTC (rev 3157) +++ branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-12-03 22:25:05 UTC (rev 3158) @@ -7,10 +7,10 @@ objects = { /* Begin PBXBuildFile section */ - 73BC1BBE0F576864003412C5 /* gcc3x-interp.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB90F576864003412C5 /* gcc3x-interp.c */; }; 733AC8DB0FEAAC4F007C6206 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = 733AC8DA0FEAAC4F007C6206 /* version.c */; }; 733B2C37106AB74B004652BE /* sqExternalSemaphores.c in Sources */ = {isa = PBXBuildFile; fileRef = 733B2C36106AB74B004652BE /* sqExternalSemaphores.c */; }; 7351A09B100963670035A878 /* sqUnixThreads.c in Sources */ = {isa = PBXBuildFile; fileRef = 7351A09A100963670035A878 /* sqUnixThreads.c */; }; + 735B4CA30E8069B7008FA2CA /* VMProfileMacSupportPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */; }; 737888E713D0DE6500C5E1AD /* sqMemoryFence.h in Headers */ = {isa = PBXBuildFile; fileRef = 737888E513D0DE6500C5E1AD /* sqMemoryFence.h */; }; 737888E813D0DE6500C5E1AD /* sqSCCSVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 737888E613D0DE6500C5E1AD /* sqSCCSVersion.h */; }; 738FB1EA0EE4CF94004BEE42 /* ia32abicc.c in Sources */ = {isa = PBXBuildFile; fileRef = 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */; }; @@ -20,6 +20,7 @@ 739C6EDA112DCBD10049B7D3 /* sqAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 739C6ED8112DCBD10049B7D3 /* sqAssert.h */; }; 73B54C530E55EFED00FE780C /* sqUnixVMProfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B54C520E55EFED00FE780C /* sqUnixVMProfile.c */; }; 73B96E490E47D7A10079C51B /* sqUnixHeartbeat.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B96E480E47D7A10079C51B /* sqUnixHeartbeat.c */; }; + 73BC1BBE0F576864003412C5 /* gcc3x-interp.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB90F576864003412C5 /* gcc3x-interp.c */; }; 73DFFAC018D380C200C3C543 /* AioPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73DFFABF18D380C200C3C543 /* AioPlugin.c */; }; 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */ = {isa = PBXBuildFile; fileRef = 94002C4209EB18EF003C4BF2 /* sqMemoryAccess.h */; }; 941A3B2D09AA144000C9D25A /* sqMacOpenGL.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AE0F02EB4E090100013C /* sqMacOpenGL.h */; }; @@ -53,7 +54,6 @@ 941A3B4A09AA144000C9D25A /* jpeglib.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AF5C02EB4E0A0100013C /* jpeglib.h */; }; 941A3B4B09AA144000C9D25A /* JPEGReadWriter2Plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AF5D02EB4E0A0100013C /* JPEGReadWriter2Plugin.h */; }; 941A3B4C09AA144000C9D25A /* jversion.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AF6102EB4E0A0100013C /* jversion.h */; }; - 941A3B4D09AA144000C9D25A /* MIDIPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AF6402EB4E0A0100013C /* MIDIPlugin.h */; }; 941A3B4E09AA144000C9D25A /* SecurityPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFBD02EB4E0A0100013C /* SecurityPlugin.h */; }; 941A3B4F09AA144000C9D25A /* SerialPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFBF02EB4E0A0100013C /* SerialPlugin.h */; }; 941A3B5009AA144000C9D25A /* SocketPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFC102EB4E0A0100013C /* SocketPlugin.h */; }; @@ -95,7 +95,6 @@ 941A3B7909AA144000C9D25A /* SqueakSources.icns in Resources */ = {isa = PBXBuildFile; fileRef = 94FC2ED005498CA800A80109 /* SqueakSources.icns */; }; 941A3B9A09AA144000C9D25A /* sqMacInternetConfiguration.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3D02EB4E090100013C /* sqMacInternetConfiguration.c */; }; 941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */; }; - 941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE4302EB4E090100013C /* sqMacMIDI.c */; }; 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; }; 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; }; 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; }; @@ -184,7 +183,6 @@ 941A3BFC09AA144000C9D25A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 087740A400C6A47FC0A80109 /* Carbon.framework */; }; 941A3BFD09AA144000C9D25A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 087740A700C6A4EDC0A80109 /* OpenGL.framework */; }; 941A3BFE09AA144000C9D25A /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0192233A00CCBFCBC0A80109 /* AGL.framework */; }; - 941A3BFF09AA144000C9D25A /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05DD6BB000CCC66FC0A80109 /* QuickTime.framework */; }; 941A3C0009AA144000C9D25A /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94D42ACA07B2C071001CCA37 /* CoreAudio.framework */; }; 941A3C0109AA144000C9D25A /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94D42AFC07B2C5DF001CCA37 /* AudioToolbox.framework */; }; 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; @@ -224,7 +222,6 @@ A277294E0CE7A8D300ABAFCA /* LocalePlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729180CE7A8D300ABAFCA /* LocalePlugin.c */; }; A277294F0CE7A8D300ABAFCA /* MacMenubarPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A277291A0CE7A8D300ABAFCA /* MacMenubarPlugin.c */; }; A27729500CE7A8D300ABAFCA /* Matrix2x3Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A277291C0CE7A8D300ABAFCA /* Matrix2x3Plugin.c */; }; - A27729510CE7A8D300ABAFCA /* MIDIPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A277291E0CE7A8D300ABAFCA /* MIDIPlugin.c */; }; A27729520CE7A8D300ABAFCA /* MiscPrimitivePlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729200CE7A8D300ABAFCA /* MiscPrimitivePlugin.c */; }; A27729530CE7A8D300ABAFCA /* RePlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729220CE7A8D300ABAFCA /* RePlugin.c */; }; A27729540CE7A8D300ABAFCA /* SecurityPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729240CE7A8D300ABAFCA /* SecurityPlugin.c */; }; @@ -235,7 +232,6 @@ A27729590CE7A8D300ABAFCA /* SoundPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A277292E0CE7A8D300ABAFCA /* SoundPlugin.c */; }; A277295A0CE7A8D300ABAFCA /* StarSqueakPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729300CE7A8D300ABAFCA /* StarSqueakPlugin.c */; }; A277295B0CE7A8D300ABAFCA /* UUIDPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729330CE7A8D300ABAFCA /* UUIDPlugin.c */; }; - 735B4CA30E8069B7008FA2CA /* VMProfileMacSupportPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */; }; A277295D0CE7A8D300ABAFCA /* ZipPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729370CE7A8D300ABAFCA /* ZipPlugin.c */; }; A27729770CE7A9AE00ABAFCA /* sqMacHostWindow.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729750CE7A9AE00ABAFCA /* sqMacHostWindow.c */; }; A27729780CE7A9AE00ABAFCA /* sqMacHostWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A27729760CE7A9AE00ABAFCA /* sqMacHostWindow.h */; }; @@ -255,7 +251,6 @@ /* Begin PBXFileReference section */ 0192233A00CCBFCBC0A80109 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; }; - 05DD6BB000CCC66FC0A80109 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; }; 087740A300C6A47FC0A80109 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 087740A400C6A47FC0A80109 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 087740A700C6A4EDC0A80109 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; @@ -269,6 +264,7 @@ 733AC8DA0FEAAC4F007C6206 /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = "<group>"; }; 733B2C36106AB74B004652BE /* sqExternalSemaphores.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqExternalSemaphores.c; sourceTree = "<group>"; }; 7351A09A100963670035A878 /* sqUnixThreads.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixThreads.c; path = vm/sqUnixThreads.c; sourceTree = "<group>"; }; + 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = VMProfileMacSupportPlugin.c; path = VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c; sourceTree = "<group>"; }; 737888E513D0DE6500C5E1AD /* sqMemoryFence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqMemoryFence.h; sourceTree = "<group>"; }; 737888E613D0DE6500C5E1AD /* sqSCCSVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSCCSVersion.h; sourceTree = "<group>"; }; 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ia32abicc.c; path = IA32ABI/ia32abicc.c; sourceTree = "<group>"; }; @@ -373,7 +369,6 @@ A277292E0CE7A8D300ABAFCA /* SoundPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SoundPlugin.c; path = SoundPlugin/SoundPlugin.c; sourceTree = "<group>"; }; A27729300CE7A8D300ABAFCA /* StarSqueakPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = StarSqueakPlugin.c; path = StarSqueakPlugin/StarSqueakPlugin.c; sourceTree = "<group>"; }; A27729330CE7A8D300ABAFCA /* UUIDPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = UUIDPlugin.c; path = UUIDPlugin/UUIDPlugin.c; sourceTree = "<group>"; }; - 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = VMProfileMacSupportPlugin.c; path = VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c; sourceTree = "<group>"; }; A27729370CE7A8D300ABAFCA /* ZipPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ZipPlugin.c; path = ZipPlugin/ZipPlugin.c; sourceTree = "<group>"; }; A27729750CE7A9AE00ABAFCA /* sqMacHostWindow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqMacHostWindow.c; sourceTree = "<group>"; }; A27729760CE7A9AE00ABAFCA /* sqMacHostWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqMacHostWindow.h; sourceTree = "<group>"; }; @@ -515,7 +510,6 @@ 941A3BFC09AA144000C9D25A /* Carbon.framework in Frameworks */, 941A3BFD09AA144000C9D25A /* OpenGL.framework in Frameworks */, 941A3BFE09AA144000C9D25A /* AGL.framework in Frameworks */, - 941A3BFF09AA144000C9D25A /* QuickTime.framework in Frameworks */, 941A3C0009AA144000C9D25A /* CoreAudio.framework in Frameworks */, 941A3C0109AA144000C9D25A /* AudioToolbox.framework in Frameworks */, 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */, @@ -542,7 +536,6 @@ 94D42ACA07B2C071001CCA37 /* CoreAudio.framework */, 087740A700C6A4EDC0A80109 /* OpenGL.framework */, 0192233A00CCBFCBC0A80109 /* AGL.framework */, - 05DD6BB000CCC66FC0A80109 /* QuickTime.framework */, 944B5B5008F5C7A900611DF8 /* Foundation.framework */, A27729A70CE7AFBE00ABAFCA /* SystemConfiguration.framework */, DAD40DAF0AA60CE90082521A /* CoreVM.plist */, @@ -668,20 +661,6 @@ path = RePlugin; sourceTree = "<group>"; }; - A27729630CE7A92800ABAFCA /* WebProxyPlugin */ = { - isa = PBXGroup; - children = ( - ); - path = WebProxyPlugin; - sourceTree = "<group>"; - }; - A277296F0CE7A95400ABAFCA /* WebProxyPlugin */ = { - isa = PBXGroup; - children = ( - ); - path = WebProxyPlugin; - sourceTree = "<group>"; - }; A27729740CE7A9AE00ABAFCA /* HostWindowPlugin */ = { isa = PBXGroup; children = ( @@ -699,13 +678,6 @@ path = HostWindowPlugin; sourceTree = "<group>"; }; - A27729980CE7AEE400ABAFCA /* WebProxyPlugin */ = { - isa = PBXGroup; - children = ( - ); - path = WebProxyPlugin; - sourceTree = "<group>"; - }; A2DB7E170EA02105005419A3 /* GIFLibPlugin */ = { isa = PBXGroup; children = ( @@ -730,20 +702,6 @@ name = LocalePlugin; sourceTree = "<group>"; }; - DAFB92EC0B9F50CF000B4B7C /* FileDialogPlugin */ = { - isa = PBXGroup; - children = ( - ); - path = FileDialogPlugin; - sourceTree = "<group>"; - }; - DAFB93040B9F5D00000B4B7C /* FileDialogPlugin */ = { - isa = PBXGroup; - children = ( - ); - path = FileDialogPlugin; - sourceTree = "<group>"; - }; F5F8ADC002EB4E090100013C /* Sources */ = { isa = PBXGroup; children = ( @@ -763,7 +721,7 @@ 948214FE080E3ABE0061C2AB /* interp.h */, ); name = vm; - path = ../../spurstacksrc/vm; + path = ../../spurstack64src/vm; sourceTree = "<group>"; }; F5F8AE0802EB4E090100013C /* Mac OS */ = { @@ -782,7 +740,6 @@ F5F8AE0B02EB4E090100013C /* AsynchFilePlugin */, F5F8AE0D02EB4E090100013C /* B3DAcceleratorPlugin */, F5F8AE1102EB4E090100013C /* DropPlugin */, - DAFB92EC0B9F50CF000B4B7C /* FileDialogPlugin */, F5F8AE3902EB4E090100013C /* FilePlugin */, A27729740CE7A9AE00ABAFCA /* HostWindowPlugin */, F5F8AE3B02EB4E090100013C /* InternetConfigPlugin */, @@ -796,7 +753,6 @@ F5F8AE5602EB4E0A0100013C /* SocketPlugin */, F5F8AE5D02EB4E0A0100013C /* SoundPlugin */, F5F8AE6902EB4E0A0100013C /* UUIDPlugin */, - A27729630CE7A92800ABAFCA /* WebProxyPlugin */, ); path = plugins; sourceTree = "<group>"; @@ -980,14 +936,11 @@ isa = PBXGroup; children = ( A2DB7E170EA02105005419A3 /* GIFLibPlugin */, - A27729980CE7AEE400ABAFCA /* WebProxyPlugin */, A27729790CE7A9BE00ABAFCA /* HostWindowPlugin */, - A277296F0CE7A95400ABAFCA /* WebProxyPlugin */, A2FB6B710CCD722300A29088 /* LocalePlugin */, F5F8AF1202EB4E0A0100013C /* AsynchFilePlugin */, F5F8AF1402EB4E0A0100013C /* B3DAcceleratorPlugin */, F5F8AF1902EB4E0A0100013C /* DropPlugin */, - DAFB93040B9F5D00000B4B7C /* FileDialogPlugin */, F5F8AF1D02EB4E0A0100013C /* FilePlugin */, 738FB1E80EE4CF4B004BEE42 /* IA32ABI */, F5F8AF2002EB4E0A0100013C /* InternetConfigPlugin */, @@ -1283,7 +1236,6 @@ 941A3B4A09AA144000C9D25A /* jpeglib.h in Headers */, 941A3B4B09AA144000C9D25A /* JPEGReadWriter2Plugin.h in Headers */, 941A3B4C09AA144000C9D25A /* jversion.h in Headers */, - 941A3B4D09AA144000C9D25A /* MIDIPlugin.h in Headers */, 941A3B4E09AA144000C9D25A /* SecurityPlugin.h in Headers */, 941A3B4F09AA144000C9D25A /* SerialPlugin.h in Headers */, 941A3B5009AA144000C9D25A /* SocketPlugin.h in Headers */, @@ -1347,6 +1299,8 @@ 941A3BFA09AA144000C9D25A /* Frameworks */, 941A3C0409AA144000C9D25A /* Rez */, ); + buildRules = ( + ); name = Squeak; productInstallPath = "$(USER_APPS_DIR)"; productName = "Squeak VM OPT"; @@ -1431,7 +1385,6 @@ files = ( 941A3B9A09AA144000C9D25A /* sqMacInternetConfiguration.c in Sources */, 941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */, - 941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */, 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */, 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */, 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */, @@ -1547,7 +1500,6 @@ A277294E0CE7A8D300ABAFCA /* LocalePlugin.c in Sources */, A277294F0CE7A8D300ABAFCA /* MacMenubarPlugin.c in Sources */, A27729500CE7A8D300ABAFCA /* Matrix2x3Plugin.c in Sources */, - A27729510CE7A8D300ABAFCA /* MIDIPlugin.c in Sources */, A27729520CE7A8D300ABAFCA /* MiscPrimitivePlugin.c in Sources */, A27729530CE7A8D300ABAFCA /* RePlugin.c in Sources */, A27729540CE7A8D300ABAFCA /* SecurityPlugin.c in Sources */, @@ -1584,7 +1536,7 @@ 73BCFAF20EFB043300B7BA8D /* Assert */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1592,15 +1544,15 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", - "TZ=\"$TZ\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "TZ=\\\"$TZ\\\""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION_i386 = 4.2; GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( /Developer/Headers/FlatCarbon, @@ -1622,16 +1574,17 @@ 73BCFAF30EFB043300B7BA8D /* Assert */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", - "TZ=\"$TZ\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1 = "TZ=\\\"$TZ\\\""; HEADER_SEARCH_PATHS = ( /Developer/Headers/FlatCarbon, $SRCROOT, @@ -1643,7 +1596,7 @@ 941A3C0809AA144000C9D25A /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; GCC_DYNAMIC_NO_PIC = YES; @@ -1654,7 +1607,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", - "TZ=\"$TZ\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1662,8 +1615,8 @@ HAVE_SYS_TIME_H, "EXTERNALPRIMSDEBUG=1", ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "TZ=\\\"$TZ\\\""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION_i386 = 4.2; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; GCC_WARN_MISSING_PARENTHESES = YES; @@ -1681,7 +1634,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; - PER_ARCH_CFLAGS_i386 = ""; PRODUCT_NAME = Squeak; WARNING_CFLAGS = ""; WRAPPER_EXTENSION = app; @@ -1692,7 +1644,7 @@ 941A3C0909AA144000C9D25A /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; COPY_PHASE_STRIP = YES; GCC_AUTO_VECTORIZATION = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -1704,16 +1656,16 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", - "TZ=\"$TZ\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, ); GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "$(GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1)"; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1 = "BUILD_VERSION=\"\\\"Squeak Stack Spur OS/X 5.0.0\\\"\""; + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "TZ=\\\"$TZ\\\""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_UNROLL_LOOPS = YES; - GCC_VERSION_i386 = 4.2; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( @@ -1724,7 +1676,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; - PER_ARCH_CFLAGS_i386 = "-O3 -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium4 -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS"; + PER_ARCH_CFLAGS_x86_64 = "-O3 -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium4 -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS"; PRODUCT_NAME = Squeak; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ""; @@ -1736,7 +1688,7 @@ 941A3C0A09AA144000C9D25A /* DeploymentSymbols */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1745,14 +1697,14 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", - "TZ=\"$TZ\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "TZ=\\\"$TZ\\\""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION_i386 = 4.2; GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( /Developer/Headers/FlatCarbon, @@ -1774,17 +1726,18 @@ 94D95B1E0923E6810034C6F0 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", - "TZ=\"$TZ\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, "EXTERNALPRIMSDEBUG=1", ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1 = "TZ=\\\"$TZ\\\""; HEADER_SEARCH_PATHS = ( /Developer/Headers/FlatCarbon, $SRCROOT, @@ -1796,16 +1749,17 @@ 94D95B1F0923E6810034C6F0 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", - "TZ=\"$TZ\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1 = "TZ=\\\"$TZ\\\""; GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ( /Developer/Headers/FlatCarbon, @@ -1818,15 +1772,16 @@ 94D95B200923E6810034C6F0 /* DeploymentSymbols */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", - "TZ=\"$TZ\"", + "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, ); + GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1 = "TZ=\\\"$TZ\\\""; HEADER_SEARCH_PATHS = ( /Developer/Headers/FlatCarbon, $SRCROOT, Modified: branches/Cog/build.macos64x64/squeak.stack.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj 2014-12-02 18:02:39 UTC (rev 3157) +++ branches/Cog/build.macos64x64/squeak.stack.spur/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj 2014-12-03 22:25:05 UTC (rev 3158) @@ -28,7 +28,7 @@ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* CroquetPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CroquetPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstack64src/vm/interp.h; sourceTree = SOURCE_ROOT; }; A271C7DE0CEB878E0014AC5E /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; A271C7DF0CEB878E0014AC5E /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; A271C7E00CEB87BE0014AC5E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -210,7 +210,7 @@ 4FADC23508B4156C00ABE55E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G4; GCC_OPTIMIZATION_LEVEL = s; @@ -221,17 +221,6 @@ HAVE_SYS_TIME_H, NO_ISNAN, ); - ICC_DEFINES = "$(GCC_PREPROCESSOR_DEFINITIONS)"; - ICC_FP_MODEL = source; - ICC_IGNORE_STD_INCLUDEDIR = NO; - ICC_LANG_ANSI = "compiler-default"; - ICC_OPTLEVEL = none; - ICC_OPT_INLINE = default; - ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION = NO; - ICC_OPT_LOOP_UNROLL = "-unroll"; - ICC_OPT_USE_ARCH_IA32 = archT; - ICC_OTHER_CFLAGS = "$(inherited)"; - ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; OTHER_CFLAGS = ( @@ -271,11 +260,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; - ICC_FP_MODEL = source; - ICC_FP_SPECULATION = off; - ICC_OPTLEVEL = speedHLO; - ICC_OTHER_CFLAGS = "$(OTHER_CFLAGS)"; - ICC_OTHER_CPLUSPLUSFLAGS = "$(ICC_OTHER_CFLAGS) $(OTHER_CPLUSPLUSFLAGS)"; OTHER_CFLAGS = "$(OTHER_CFLAGS)"; PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; Modified: branches/Cog/build.macos64x64/squeak.stack.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj 2014-12-02 18:02:39 UTC (rev 3157) +++ branches/Cog/build.macos64x64/squeak.stack.spur/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj 2014-12-03 22:25:05 UTC (rev 3158) @@ -26,7 +26,7 @@ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* FloatArrayPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FloatArrayPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstack64src/vm/interp.h; sourceTree = SOURCE_ROOT; }; A271C7DE0CEB878E0014AC5E /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; A271C7DF0CEB878E0014AC5E /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; A271C7E00CEB87BE0014AC5E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -187,7 +187,7 @@ 4FADC23508B4156C00ABE55E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G4; GCC_OPTIMIZATION_LEVEL = s; @@ -198,17 +198,6 @@ HAVE_SYS_TIME_H, NO_ISNAN, ); - ICC_DEFINES = "$(GCC_PREPROCESSOR_DEFINITIONS)"; - ICC_FP_MODEL = source; - ICC_IGNORE_STD_INCLUDEDIR = NO; - ICC_LANG_ANSI = "compiler-default"; - ICC_OPTLEVEL = none; - ICC_OPT_INLINE = default; - ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION = NO; - ICC_OPT_LOOP_UNROLL = "-unroll"; - ICC_OPT_USE_ARCH_IA32 = archT; - ICC_OTHER_CFLAGS = "$(inherited)"; - ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; OTHER_CFLAGS = ( @@ -248,11 +237,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; - ICC_FP_MODEL = source; - ICC_FP_SPECULATION = off; - ICC_OPTLEVEL = speedHLO; - ICC_OTHER_CFLAGS = "$(OTHER_CFLAGS)"; - ICC_OTHER_CPLUSPLUSFLAGS = "$(ICC_OTHER_CFLAGS) $(OTHER_CPLUSPLUSFLAGS)"; OTHER_CFLAGS = "$(OTHER_CFLAGS)"; PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; Modified: branches/Cog/build.macos64x64/squeak.stack.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj 2014-12-02 18:02:39 UTC (rev 3157) +++ branches/Cog/build.macos64x64/squeak.stack.spur/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj 2014-12-03 22:25:05 UTC (rev 3158) @@ -60,7 +60,7 @@ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* FloatMathPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FloatMathPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + A271C7DD0CEB874D0014AC5E /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstack64src/vm/interp.h; sourceTree = SOURCE_ROOT; }; A271C7DE0CEB878E0014AC5E /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; A271C7DF0CEB878E0014AC5E /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; A271C7E00CEB87BE0014AC5E /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -367,7 +367,7 @@ 4FADC23508B4156C00ABE55E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_MODEL_TUNING = G4; GCC_OPTIMIZATION_LEVEL = 2; @@ -378,17 +378,6 @@ HAVE_SYS_TIME_H, NO_ISNAN, ); - ICC_DEFINES = "$(GCC_PREPROCESSOR_DEFINITIONS)"; - ICC_FP_MODEL = source; - ICC_IGNORE_STD_INCLUDEDIR = NO; - ICC_LANG_ANSI = "compiler-default"; - ICC_OPTLEVEL = none; - ICC_OPT_INLINE = default; - ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION = NO; - ICC_OPT_LOOP_UNROLL = "-unroll"; - ICC_OPT_USE_ARCH_IA32 = archT; - ICC_OTHER_CFLAGS = "$(inherited)"; - ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Bundles"; OTHER_CFLAGS = ( @@ -433,11 +422,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; - ICC_FP_MODEL = source; - ICC_FP_SPECULATION = off; - ICC_OPTLEVEL = speedHLO; - ICC_OTHER_CFLAGS = "$(OTHER_CFLAGS)"; - ICC_OTHER_CPLUSPLUSFLAGS = "$(ICC_OTHER_CFLAGS) $(OTHER_CPLUSPLUSFLAGS)"; OTHER_CFLAGS = "$(OTHER_CFLAGS)"; PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; Modified: branches/Cog/build.macos64x64/squeak.stack.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2014-12-02 18:02:39 UTC (rev 3157) +++ branches/Cog/build.macos64x64/squeak.stack.spur/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2014-12-03 22:25:05 UTC (rev 3158) @@ -47,7 +47,7 @@ A2181BC010814E0B00B8FC7A /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; A2181BC210814E4E00B8FC7A /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; }; A2181BC310814E4E00B8FC7A /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; }; - A2181BC410814E7000B8FC7A /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + A2181BC410814E7000B8FC7A /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstack64src/vm/interp.h; sourceTree = SOURCE_ROOT; }; A2181BC510814EA000B8FC7A /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; A2181BC810814EC700B8FC7A /* ac3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ac3.h; sourceTree = "<group>"; }; A2181BC910814EC700B8FC7A /* dct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dct.c; sourceTree = "<group>"; }; @@ -342,7 +342,7 @@ 946BCE020959347500803517 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Deployment; Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj 2014-12-02 18:02:39 UTC (rev 3157) +++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj 2014-12-03 22:25:05 UTC (rev 3158) @@ -21,7 +21,7 @@ 730BD72510AA25350023C110 /* SqueakFFIPrims.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = SqueakFFIPrims.c; path = ../../../src/plugins/SqueakFFIPrims/SqueakFFIPrims.c; sourceTree = SOURCE_ROOT; }; 730BD72710AA26D00023C110 /* sqFFIPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = sqFFIPlugin.c; path = ../../../platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c; sourceTree = SOURCE_ROOT; }; 730BD72910AA26EF0023C110 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; - 730BD72A10AA26FB0023C110 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + 730BD72A10AA26FB0023C110 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstack64src/vm/interp.h; sourceTree = SOURCE_ROOT; }; 730BD72D10AA27410023C110 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; 730BD72F10AA27590023C110 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; 730BD73010AA277B0023C110 /* SqueakPlugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = SqueakPlugin.icns; path = ../resources/ProjectBuilder/SqueakPlugin.icns; sourceTree = SOURCE_ROOT; }; @@ -184,7 +184,7 @@ 1DEB911C08733D790010E9CD /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 2; INFOPLIST_FILE = Info.plist; Modified: branches/Cog/build.macos64x64/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-12-02 18:02:39 UTC (rev 3157) +++ branches/Cog/build.macos64x64/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-12-03 22:25:05 UTC (rev 3158) @@ -27,7 +27,7 @@ 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstack64src/vm/interp.h; sourceTree = SOURCE_ROOT; }; DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -218,7 +218,7 @@ 4FADC23508B4156C00ABE55E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch; Modified: branches/Cog/build.macos64x64/squeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2014-12-02 18:02:39 UTC (rev 3157) +++ branches/Cog/build.macos64x64/squeak.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2014-12-03 22:25:05 UTC (rev 3158) @@ -16,7 +16,7 @@ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 7308DE360B9614A4003B7CCD /* UnixOSProcessPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = UnixOSProcessPlugin.c; path = ../../../src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c; sourceTree = "<group>"; }; 73662FE60F53864E00C64E7F /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = Cross/vm/sqMemoryAccess.h; sourceTree = "<group>"; }; - 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstack64src/vm/interp.h; sourceTree = SOURCE_ROOT; }; 73662FE80F53864E00C64E7F /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "Mac OS/vm/config.h"; sourceTree = "<group>"; }; 73662FE90F53864E00C64E7F /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "Mac OS/vm/sqConfig.h"; sourceTree = "<group>"; }; 73662FEA0F53864E00C64E7F /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "Mac OS/vm/sqPlatformSpecific.h"; sourceTree = "<group>"; }; @@ -189,7 +189,7 @@ 4FADC23408B4156C00ABE55E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -219,7 +219,7 @@ 4FADC23508B4156C00ABE55E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = x86_64; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = ( Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-02 18:02:39 UTC (rev 3157) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-03 22:25:05 UTC (rev 3158) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b from - CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a + CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -636,6 +636,7 @@ EXPORT(void) primitiveCompareBytes(void); static void primitiveConstantFill(void); static void primitiveControlVMProfiling(void); +static void primitiveCopyObject(void); EXPORT(sqInt) primitiveCrashVM(void); EXPORT(sqInt) primitiveDisablePowerManager(void); static void primitiveDiv(void); @@ -812,6 +813,7 @@ sqInt checkOkayOop(usqInt oop); static sqInt checkOopIntegritynamed(sqInt obj, char *name) NoDbgRegParms; sqInt clone(sqInt obj); +static double dbgFloatValueOf(sqInt oop) NoDbgRegParms; static sqInt defaultEdenBytes(void); static sqInt eeInstantiateAndInitializeClassindexableSize(sqInt classPointer, sqInt size) NoDbgRegParms; sqInt eeInstantiateClassIndexformatnumSlots(sqInt compactClassIndex, sqInt objFormat, sqInt numSlots); @@ -819,6 +821,7 @@ static sqInt eeInstantiateMethodContextSlots(sqInt numSlots) NoDbgRegParms; static sqInt eeInstantiateSmallClassIndexformatnumSlots(sqInt compactClassIndex, sqInt objFormat, sqInt numSlots) NoDbgRegParms; static sqInt eeInstantiateSmallClassnumSlots(sqInt classPointer, sqInt numSlots) NoDbgRegParms; +static sqInt fetchClassTagOfNonImm(sqInt oop) NoDbgRegParms; void findStringBeginningWith(char *aCString); void findString(char *aCString); sqInt floatObjectOf(double aFloat); @@ -1049,7 +1052,6 @@ sqInt copyBitsFromtoat(sqInt x0, sqInt x1, sqInt y); static void cr(void); static void createActualMessageTo(sqInt lookupClass) NoDbgRegParms; -static double dbgFloatValueOf(sqInt oop) NoDbgRegParms; static sqInt defaultNumStackPages(void); static sqInt displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b) NoDbgRegParms; static sqInt divorceAllFrames(void); @@ -1149,6 +1151,7 @@ static sqInt marriedContextpointsTostackDeltaForCurrentFrame(sqInt spouseContext, sqInt anOop, sqInt stackDeltaForCurrentFrame) NoDbgRegParms; static void marryContextInNewStackPageAndInitializeInterpreterRegisters(sqInt aContext) NoDbgRegParms; static sqInt marryFrameSP(char *theFP, char *theSP) NoDbgRegParms; +static sqInt maybeSelectorOfMethod(sqInt methodObj) NoDbgRegParms; sqInt methodArgumentCount(void); sqInt methodArg(sqInt index); sqInt methodClassAssociationOf(sqInt methodPointer); @@ -1283,11 +1286,11 @@ static sqInt writeImageFileIO(void); static sqInt fieldOrSenderFPofContext(sqInt index, sqInt contextObj) NoDbgRegParms; static sqInt fieldofFrame(sqInt index, char *theFP) NoDbgRegParms; +static sqInt isAppropriateForCopyObject(sqInt oop) NoDbgRegParms; static void primitiveClone(void); static void primitiveContextAt(void); static void primitiveContextAtPut(void); static void primitiveContextSize(void); -static void primitiveCopyObject(void); static void primitiveDeferDisplayUpdates(void); static void primitiveDoNamedPrimitiveWithArgs(void); static void primitiveDoPrimitiveWithArgs(void); @@ -2093,7 +2096,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.957"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.962"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -7894,8 +7897,7 @@ } } else { - if (!(((rcvr & 1) == 0) - && (ClassFloatCompactIndex == ((((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)))) { + if (!(isinstanceOfcompactClassIndex(rcvr, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord()))), ClassFloatCompactIndex))) { /* begin success: */ /* Don't overwrite an error code that has already been set. */ @@ -10849,8 +10851,7 @@ } } else { - if (!(((rcvr & 1) == 0) - && (ClassFloatCompactIndex == ((((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)))) { + if (!(isinstanceOfcompactClassIndex(rcvr, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord()))), ClassFloatCompactIndex))) { /* begin success: */ /* Don't overwrite an error code that has already been set. */ @@ -26032,6 +26033,91 @@ } +/* Primitive. Copy the state of the receiver from the argument. + Fail if receiver and argument are of a different class. + Fail if the receiver or argument are contexts (because of context-to-stack + mapping). Fail if receiver and argument have different lengths (for + indexable objects). + Fail if the objects are not in a fit state to be copied (e.g. married + contexts and Cogged methods) */ + +static void @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.962.mcz
by commits＠source.squeak.org 03 Dec '14

03 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.962.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.962 Author: eem Time: 3 December 2014, 2:09:45.26 pm UUID: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b Ancestors: VMMaker.oscog-eem.961 Improve stack trace printing for Newspeak and Glue by providing something that assumes the penultimate literal is the selector or an AdditionalMethodState-like thing containing it. Fix generation of 64-bit Spur VMs by adding translation support for timesRepeat:, by initializing BytesPerOop in SpurMemoryManager class, and by initializing is64BitVM in VMMaker. Add a configuration for the 64-bit Spur Stack VM. =============== Diff against VMMaker.oscog-eem.961 =============== Item was added: + ----- Method: CCodeGenerator>>generateTimesRepeat:on:indent: (in category 'C translation') ----- + generateTimesRepeat: msgNode on: aStream indent: level + "Generate while(1) { stmtList } " + + msgNode receiver value timesRepeat: + [msgNode args first emitCCodeOn: aStream level: level generator: self]! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #>>> #generateSignedShiftRight: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 #generateBitInvert:on:indent: #bitInvert64 #generateBitInvert:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded: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: + #timesRepeat: #generateTimesRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress: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: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: SpurMemoryManager class>>initBytesPerWord: (in category 'class initialization') ----- + initBytesPerWord: wordSize - initBytesPerWord: nBytes + BytesPerWord := BytesPerOop := wordSize. - BytesPerWord := nBytes. "The following is necessary to avoid confusing the compiler with shifts that are larger than the width of the type on which they operate. In gcc, such shifts cause incorrect code to be generated." BytesPerWord = 8 ifTrue: "64-bit VM" [Byte0Mask := 16r00000000000000FF. Byte0Shift := 0. Byte1Mask := 16r000000000000FF00. Byte1Shift := 8. Byte2Mask := 16r0000000000FF0000. Byte2Shift := 16. Byte3Mask := 16r00000000FF000000. Byte3Shift := 24. Byte4Mask := 16r000000FF00000000. Byte4Shift := 32. Byte5Mask := 16r0000FF0000000000. Byte5Shift := 40. Byte6Mask := 16r00FF000000000000. Byte6Shift := 48. Byte7Mask := 16rFF00000000000000. Byte7Shift := 56. Bytes3to0Mask := 16r00000000FFFFFFFF. Bytes7to4Mask := 16rFFFFFFFF00000000] ifFalse: "32-bit VM" [Byte0Mask := 16r00000000000000FF. Byte0Shift := 0. Byte1Mask := 16r000000000000FF00. Byte1Shift := 8. Byte2Mask := 16r0000000000FF0000. Byte2Shift := 16. Byte3Mask := 16r00000000FF000000. Byte3Shift := 24. Byte4Mask := nil. Byte4Shift := 0. "unused" Byte5Mask := nil. Byte5Shift := 0. "unused" Byte6Mask := nil. Byte6Shift := 0. "unused" Byte7Mask := nil. Byte7Shift := 0. "unused" Bytes3to0Mask := nil. "unused" Bytes7to4Mask := nil "unused"]. Byte1ShiftNegated := Byte1Shift negated. Byte3ShiftNegated := Byte3Shift negated. Byte4ShiftNegated := Byte4Shift negated. Byte5ShiftNegated := Byte5Shift negated. Byte7ShiftNegated := Byte7Shift negated. "N.B. This is *not* output when generating the interpreter file. It is left to the various sqConfig.h files to define correctly." VMBIGENDIAN := Smalltalk endianness == #big! Item was changed: ----- Method: StackInterpreter>>findSelectorOfMethod: (in category 'debug support') ----- findSelectorOfMethod: methArg | meth classObj classDict classDictSize methodArray i | (objectMemory addressCouldBeObj: methArg) ifFalse: [^objectMemory nilObject]. (objectMemory isForwarded: methArg) ifTrue: [meth := objectMemory followForwarded: methArg] ifFalse: [meth := methArg]. (objectMemory isOopCompiledMethod: meth) ifFalse: [^objectMemory nilObject]. + NewspeakVM ifTrue: + [(self maybeSelectorOfMethod: meth) ifNotNil: + [:selector| ^selector]]. classObj := self safeMethodClassOf: meth. (self addressCouldBeClassObj: classObj) ifTrue: [classDict := objectMemory fetchPointer: MethodDictionaryIndex ofObject: classObj. classDictSize := objectMemory numSlotsOf: classDict. classDictSize > MethodArrayIndex ifTrue: [methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. i := 0. [i < (classDictSize - SelectorStart)] whileTrue: [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: [^(objectMemory fetchPointer: i + SelectorStart ofObject: classDict)]. i := i + 1]]]. ^objectMemory nilObject! Item was added: + ----- Method: StackInterpreter>>maybeSelectorOfMethod: (in category 'debug support') ----- + maybeSelectorOfMethod: methodObj + "Answer the selector of a method, assuming its penultimate literal is either + a symbol or a pointer object whose first slot references the method and + whose second slot is a symbol (i.e. an AdditionalMethodState). If a Symbol + can't be found answer nil. This isn't satisfactory, as it puts a lot of information + into the VM, but it is needed for adequate crash debugging at Cadence." + | penultimateLiteral maybeSelector | + self assert: (objectMemory isOopCompiledMethod: methodObj). + penultimateLiteral := self penultimateLiteralOf: methodObj. + (objectMemory isWordsOrBytes: penultimateLiteral) ifTrue: + [^(objectMemory fetchClassTagOfNonImm: penultimateLiteral) + = (objectMemory fetchClassTagOfNonImm: (objectMemory splObj: SelectorDoesNotUnderstand)) ifTrue: + [penultimateLiteral]]. + ^((objectMemory isPointers: penultimateLiteral) + and: [(objectMemory numSlotsOf: penultimateLiteral) >= 2 + and: [(objectMemory fetchPointer: 0 ofObject: penultimateLiteral) = methodObj + and: [maybeSelector := objectMemory fetchPointer: 1 ofObject: penultimateLiteral. + (objectMemory isWordsOrBytes: maybeSelector) + and: [(objectMemory fetchClassTagOfNonImm: maybeSelector) + = (objectMemory fetchClassTagOfNonImm: (objectMemory splObj: SelectorDoesNotUnderstand))]]]]) ifTrue: + [penultimateLiteral]! Item was changed: ----- Method: StackInterpreter>>printLikelyImplementorsOfSelector: (in category 'debug printing') ----- printLikelyImplementorsOfSelector: selector "Print all methods whose penultimate literal is either selector, or an object whose first inst var is the method and whose second is selector (e.g. an AdditionalMethodState)." <api> objectMemory allObjectsDo: + [:obj| | methodClassAssociation | + ((objectMemory isCompiledMethod: obj) + and: [(self maybeSelectorOfMethod: obj) = selector]) ifTrue: + ["try and print the key of the method class association (the name of the implementing class)" + methodClassAssociation := self methodClassAssociationOf: obj. + self printHexnp: obj; + space; + printOopShortInner: (((objectMemory isPointers: methodClassAssociation) + and: [(objectMemory numSlotsOf: methodClassAssociation) >= 2]) + ifTrue: [objectMemory fetchPointer: 0 ofObject: methodClassAssociation] + ifFalse: [methodClassAssociation]); + cr]]! - [:obj| | penultimateLiteral methodClassAssociation | - (objectMemory isCompiledMethod: obj) ifTrue: - [penultimateLiteral := self penultimateLiteralOf: obj. - (penultimateLiteral = selector - or: [(objectMemory isPointers: penultimateLiteral) - and: [(objectMemory numSlotsOf: penultimateLiteral) >= 2 - and: [(objectMemory fetchPointer: 0 ofObject: penultimateLiteral) = obj - and: [(objectMemory fetchPointer: 1 ofObject: penultimateLiteral) = selector]]]]) ifTrue: - ["try and print the key of the method class association (the name of the implementing class)" - methodClassAssociation := self methodClassAssociationOf: obj. - self printHexnp: obj; - space; - printOopShortInner: (((objectMemory isPointers: methodClassAssociation) - and: [(objectMemory numSlotsOf: methodClassAssociation) >= 2]) - ifTrue: [objectMemory fetchPointer: 0 ofObject: methodClassAssociation] - ifFalse: [methodClassAssociation]); - cr]]]! Item was changed: ----- Method: StackInterpreter>>writeImageFileIO (in category 'image save/restore') ----- writeImageFileIO "Write the image header and heap contents to imageFile for snapshot. c.f. writeImageFileIOSimulation. The game below is to maintain 64-bit alignment for all putLong:toFile: occurrences." | imageName headerStart headerSize f imageBytes bytesWritten sCWIfn okToWrite | <var: #f type: #sqImageFile> <var: #headerStart type: #squeakFileOffsetType> <var: #sCWIfn type: #'void *'> <var: #imageName declareC: 'extern char imageName[]'> self cCode: [] inSmalltalk: [imageName := 'sooth compiler'. ^self writeImageFileIOSimulation]. "If the security plugin can be loaded, use it to check for write permission. If not, assume it's ok" sCWIfn := self ioLoadFunction: 'secCanWriteImage' From: 'SecurityPlugin'. sCWIfn ~= 0 ifTrue: [okToWrite := self cCode: '((sqInt (*)(void))sCWIfn)()'. okToWrite ifFalse:[^self primitiveFail]]. "local constants" headerStart := 0. headerSize := objectMemory wordSize = 4 ifTrue: [64] ifFalse: [128]. "header size in bytes; do not change!!" f := self sqImageFile: imageName Open: 'wb'. f = nil ifTrue: "could not open the image file for writing" [^self primitiveFail]. imageBytes := objectMemory imageSizeToWrite. headerStart := self sqImage: f File: imageName StartLocation: headerSize + imageBytes. self cCode: '/* Note: on Unix systems one could put an exec command here, padded to 512 bytes */'. "position file to start of header" self sqImageFile: f Seek: headerStart. self putWord32: self imageFormatVersion toFile: f. self putWord32: headerSize toFile: f. self putLong: imageBytes toFile: f. self putLong: objectMemory baseAddressOfImage toFile: f. self putLong: objectMemory specialObjectsOop toFile: f. self putLong: objectMemory newObjectHash toFile: f. self putLong: self ioScreenSize toFile: f. self putLong: self getImageHeaderFlags toFile: f. self putWord32: extraVMMemory toFile: f. self putShort: desiredNumStackPages toFile: f. self putShort: self unknownShortOrCodeSizeInKs toFile: f. self putWord32: desiredEdenBytes toFile: f. self putShort: (maxExtSemTabSizeSet ifTrue: [self ioGetMaxExtSemTableSize] ifFalse: [0]) toFile: f. self putShort: the2ndUnknownShort toFile: f. objectMemory hasSpurMemoryManagerAPI ifTrue: [self putLong: objectMemory firstSegmentBytes toFile: f. self putLong: objectMemory bytesLeftInOldSpace toFile: f. + 2 timesRepeat: [self putLong: 0 toFile: f] "Pad the rest of the header."] - 1 to: 2 do: [:i| self putLong: 0 toFile: f] "Pad the rest of the header."] ifFalse: + [4 timesRepeat: [self putLong: 0 toFile: f]]. "Pad the rest of the header." - [1 to: 4 do: [:i| self putLong: 0 toFile: f]]. "Pad the rest of the header." objectMemory wordSize = 8 ifTrue: [3 timesRepeat: [self putLong: 0 toFile: f]]. "Pad the rest of the header." self assert: headerStart + headerSize = (self sqImageFilePosition: f). "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. self successful ifFalse: "file write or seek failure" [self sqImageFileClose: f. ^nil]. "write the image data" objectMemory hasSpurMemoryManagerAPI ifTrue: [bytesWritten := objectMemory writeImageSegmentsToFile: f] ifFalse: [bytesWritten := self sq: (self pointerForOop: objectMemory baseAddressOfImage) Image: (self sizeof: #char) File: imageBytes Write: f]. self success: bytesWritten = imageBytes. self sqImageFileClose: f! Item was added: + ----- Method: VMMaker class>>generateSqueakSpurStack64VM (in category 'configurations') ----- + generateSqueakSpurStack64VM + "No primitives since we can use those for the Cog VM" + ^VMMaker + generate: StackInterpreter + with: #(ObjectMemory Spur64BitMemoryManager) + to: (FileDirectory default directoryNamed: self sourceTree, '/spurstack64src') fullName + platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName + including: #()! 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 reinitializeWordSizeFrom: cg. self needsToRegenerateInterpreterFile ifFalse: [^nil]. cg inferTypesForImplicitlyTypedVariablesAndMethods. self interpreterClass preGenerationHook: cg. vmHeaderContents := cg vmHeaderContentsWithBytesPerWord: self wordSize. (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 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 added: + ----- Method: VMMaker>>reinitializeWordSizeFrom: (in category 'initialize') ----- + reinitializeWordSizeFrom: aCCodeGenerator + | wordSize | + wordSize := aCCodeGenerator vmClass objectMemoryClass wordSize. + optionsDictionary at: #BytesPerWord put: wordSize. + is64BitVM := wordSize = 8!

1 0

Odd on NoDbgRegParms ...
by gettimothy 03 Dec '14

03 Dec '14

Hi All. Just a heads up and a quick question. While moving the #include "dispdbg.h" "fixed" the build.linux32xc86/squeak.cog.v3/build I am getting the same error in build.assert, .debug, etc... I will investigate after I complete the CMake build code and start building out the other build types. Question: Should the CMake code generate the cogit.h, cointerp.h etc? thx. tty

2 2

Re: netstyle.ch, Cog, systemd, and Socket>>initialize:
by Max Leske 03 Dec '14

03 Dec '14

> On 03.12.2014, at 19:22, Chris Cunnington <brasspen(a)gmail.com> wrote: > > >> On Dec 3, 2014, at 12:28 PM, Max Leske <maxleske(a)gmail.com <mailto:maxleske@gmail.com>> wrote: >> >> Hi Chris >> >>> On 03.12.2014, at 16:22, Chris Cunnington <brasspen(a)gmail.com <mailto:brasspen@gmail.com>> wrote: >>> >>> In July netstyle.ch <http://netstyle.ch/> said some exciting things about systemd and socket activation. [1] I have an observation and a question. >>> The observation is that to set Real Time Priority pursuant of the README for Cog you need to add the following in your Service or you will not be able to start coglinuxht. [2] >>> >>> [Service] >>> LimitRTPRIO=2 >>> >>> The question concerns the code in the systemd.cs file [4] which I don't think can work because it calls a non-existant primitive in the SocketPlugin. I suspect netstyle.ch <http://netstyle.ch/> wrote its patch for a very old virtual machine, one that still used #primitiveSocketCreate3Semaphores, which I don't think exists in contemporary SocketPlugin code. [3] In the image, there remain references to this non-existant primitive. They are employed by code in the systemd.cs file.[4] The culprit is Socket>>initialize: used in Socket class>>newSystemd. >> >> It seems you are right. We did use a Pharo1.3 image with an older VM to test the patch. However, I’m sure that we used the latest version from trunk for the patch (which was 3016 at the time). Also, if I’m not looking in the wrong place, that primitive is still there: http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/src/plugins/SocketPlugi… <http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/src/plugins/SocketPlugi…>. >> >> Does that resolve the issue? If not, please get back to me and I’ll try to fix the situation. > > Hi Max, > > Thank you very much for your quick response. I have no doubt that I've made a mistake and will look at it further. I've been at this alone for a while, so I'm sure your feedback will resolve the issue. If not, in about a week, I'd like to ask another question. Sure. > > Thanks to you and the netstyle.ch <http://netstyle.ch/> team for sharing this. It's a lot of fun. Thank you. It’s great that its something that people use and that doesn’t just collect virtual dust. > > Thanks, > Chris > >> >> Cheers, >> Max > > > >> >>> >>> So, Max, my question is, did you at netstyle.ch <http://netstyle.ch/> find a solution for this? >>> Does anybody have an idea of how to re-route Socket>>initialize: towards a primitive that actually exists? >>> >>> Thanks, >>> Chris >>> >>> >>> [1] http://lists.squeakfoundation.org/pipermail/squeak-dev/2014-July/179015.html <http://lists.squeakfoundation.org/pipermail/squeak-dev/2014-July/179015.html> >>> [2] http://www.freedesktop.org/software/systemd/man/systemd.exec.html <http://www.freedesktop.org/software/systemd/man/systemd.exec.html> >>> [3] http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/platforms/unix/ <http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/platforms/unix/> >>> [4] contents of the systemd.cs file [1]: >>> 'From Pharo1.3 of 16 June 2011 [Latest update: #13315] on 4 July 2014 at 3:20:20 pm'! >>> >>> !TcpListener methodsFor: '*systemd' stamp: 'nl 07/04/2014 15:17'! >>> haveSystemdAssignedPort >>> "LISTEN_FDS is set by systemd if the process/pharo-vm is started via port activation" >>> ^ (self primEnvironmentAtSymbol: 'LISTEN_FDS') >>> ifNotNilDo: [ :value | value asNumber = 1 ] >>> ifNil: [ false]! ! >>> >>> !TcpListener methodsFor: '*systemd' stamp: 'nl 07/04/2014 15:18'! >>> pvtNewListener: backlogSize >>> "Create a new socket that listens on our port. The backlog is how many simultaneous >>> connections to accept at the same time >>> >>> Use the socket assigned by systemd if: >>> - the command-line port number is equal to the portNumber to be opened >>> - there is an environment variable LISTEN_FDS with value 1 >>> Otherwise use normal port allocation. >>> " >>> | listener | >>> listener := (self haveSystemdAssignedPort >>> ifTrue: [ self socketClass newSystemd ] >>> ifFalse: [ self socketClass newTCP ]). >>> self socketsToDestroy add: listener. >>> self >>> bind: listener >>> withBacklogSize: backlogSize. >>> ^ listener! ! >>> >>> !TcpListener methodsFor: '*systemd' stamp: 'nl 04/29/2013 14:04'! >>> primEnvironmentAtSymbol: aSymbol >>> "Copy-paste from UnixOSProcessPlugin: Answer the value of an environment variable in the external OS process." >>> <primitive: 'primitiveEnvironmentAtSymbol' module: 'UnixOSProcessPlugin'> >>> ^ nil ! ! >>> >>> !Socket class methodsFor: '*systemd' stamp: 'nl 07/04/2014 15:23'! >>> newSystemd >>> "Create a socket assigned by systemd port activation" >>> | SystemdSocketType | >>> SystemdSocketType := 2. >>> self initializeNetwork. >>> ^[ super new initialize: SystemdSocketType ] >>> repeatWithGCIf: [ :socket | socket isValid not ]! ! >>> >> >

1 0

netstyle.ch, Cog, systemd, and Socket>>initialize:
by Chris Cunnington 03 Dec '14

03 Dec '14

In July netstyle.ch said some exciting things about systemd and socket activation. [1] I have an observation and a question. The observation is that to set Real Time Priority pursuant of the README for Cog you need to add the following in your Service or you will not be able to start coglinuxht. [2] [Service] LimitRTPRIO=2 The question concerns the code in the systemd.cs file [4] which I don't think can work because it calls a non-existant primitive in the SocketPlugin. I suspect netstyle.ch wrote its patch for a very old virtual machine, one that still used #primitiveSocketCreate3Semaphores, which I don't think exists in contemporary SocketPlugin code. [3] In the image, there remain references to this non-existant primitive. They are employed by code in the systemd.cs file.[4] The culprit is Socket>>initialize: used in Socket class>>newSystemd. So, Max, my question is, did you at netstyle.ch find a solution for this? Does anybody have an idea of how to re-route Socket>>initialize: towards a primitive that actually exists? Thanks, Chris [1] http://lists.squeakfoundation.org/pipermail/squeak-dev/2014-July/179015.html <http://lists.squeakfoundation.org/pipermail/squeak-dev/2014-July/179015.html> [2] http://www.freedesktop.org/software/systemd/man/systemd.exec.html <http://www.freedesktop.org/software/systemd/man/systemd.exec.html> [3] http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/platforms/unix/ <http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/platforms/unix/> [4] contents of the systemd.cs file [1]: 'From Pharo1.3 of 16 June 2011 [Latest update: #13315] on 4 July 2014 at 3:20:20 pm'! !TcpListener methodsFor: '*systemd' stamp: 'nl 07/04/2014 15:17'! haveSystemdAssignedPort "LISTEN_FDS is set by systemd if the process/pharo-vm is started via port activation" ^ (self primEnvironmentAtSymbol: 'LISTEN_FDS') ifNotNilDo: [ :value | value asNumber = 1 ] ifNil: [ false]! ! !TcpListener methodsFor: '*systemd' stamp: 'nl 07/04/2014 15:18'! pvtNewListener: backlogSize "Create a new socket that listens on our port. The backlog is how many simultaneous connections to accept at the same time Use the socket assigned by systemd if: - the command-line port number is equal to the portNumber to be opened - there is an environment variable LISTEN_FDS with value 1 Otherwise use normal port allocation. " | listener | listener := (self haveSystemdAssignedPort ifTrue: [ self socketClass newSystemd ] ifFalse: [ self socketClass newTCP ]). self socketsToDestroy add: listener. self bind: listener withBacklogSize: backlogSize. ^ listener! ! !TcpListener methodsFor: '*systemd' stamp: 'nl 04/29/2013 14:04'! primEnvironmentAtSymbol: aSymbol "Copy-paste from UnixOSProcessPlugin: Answer the value of an environment variable in the external OS process." <primitive: 'primitiveEnvironmentAtSymbol' module: 'UnixOSProcessPlugin'> ^ nil ! ! !Socket class methodsFor: '*systemd' stamp: 'nl 07/04/2014 15:23'! newSystemd "Create a socket assigned by systemd port activation" | SystemdSocketType | SystemdSocketType := 2. self initializeNetwork. ^[ super new initialize: SystemdSocketType ] repeatWithGCIf: [ :socket | socket isValid not ]! !

2 1

[ANN] Pharo Days 2015. The Pharo summit is back!
by Esteban Lorenzano 03 Dec '14

03 Dec '14

Pharo Days 2015 http://pharodays2015.pharo.org January 29 & 30, Lille, France INRIA Lille, building A, 40 avenue Halley, F-59650 Villeneuve d’Ascq == General Information == Start the year in the right spirit by joining the Pharo community for the Pharo Days 2015 on Thursday January 29 and Friday January 30 at INRIA, Lille, France. Meet your online colleagues, programmers and hackers in real life and experience how much you can pick up in just two days. Learn about key technologies, talk to core developers and other users, pair program and contribute to Pharo. Have fun and enjoy yourself. Each day has a similar schedule. The morning consists of a handful of twenty minute tech talks, the afternoon is a coding sprint and open pair programming workspace. There will be a general assembly of both the Pharo Consortium and the Pharo Association. On the first days there will be a parallel Getting Started with Pharo tutorial in the afternoon. The very first Pharo conference took place in Annecy in February 2011. In May 2012 the second Pharo Conference took place, over two days, in Lille. It was a huge success, with about 60 people participating. It had a very positive effect on the community and on those who participated. In April 2013 there was a third well attended Pharo Conference in Bern. In June 2013, there was also a successful Web specific Pharo one-day event in Lille. Join us again this time. == Pricing == The Pharo Days are a two day event with catering included (2 lunches, 1 diner, drinks and snacks) in a nice environment with full facilities (main room, auxiliary rooms, office furtniture and wireless network). € 199 — Regular € 149 — For individual Pharo Association Members € 89 — For individual Pharo Gold Association Members € 89 — For Pharo Consortium Members (1, 2 or 4 for silver, bronze or gold) € 39 — Students (excluding diner) € 19 — Student Volunteers (excluding diner) == Registration == For official registration we are using EventBrite. You can buy tickets using PayPal and hence any credit card. If absolutely necessary, you can opt for an off line payment. Please register on time. For social registration you can use Lanyrd or Doodle. Spread the word: Summit schedule and relevant data: http://pharodays2015.pharo.org Register here: http://www.eventbrite.com/e/pharos-days-2015-tickets-14469423435

1 0

MIDI in 64-bi Mac apps
by Eliot Miranda 03 Dec '14

03 Dec '14

Hi All, I see this in QuickTimeMusic.h. What is one to do long-term? (Short-term I'll just not include the MIDI plugin) /* QuickTime is not available to 64-bit clients */ #if !__LP64__ -- best, Eliot

3 4

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 December 2014