Vm-dev January 2012

vm-dev@lists.squeakfoundation.org

27 participants
75 discussions

Fwd: About systemTracer
by Luc Fabresse 01 Jan '12

01 Jan '12

Hi All, I am forwarding a message from David (Thanks a lot to him) who pointed that SystemTracer2 should be run with a non-cog VM otherwize, the generated image is not usable. Does someone know why? Thanks, #Luc ---------- Forwarded message ---------- From: David T. Lewis <lewis(a)mail.msen.com> Date: 2011/12/30 Actually, I think I just spotted the problem. If I use an interpreter VM to run the system tracer, then load the cloned image with an interpreter VM, then save the cloned image, then run it under Cog, it works. If I use Cog to do the system tracing, the cloned image does not work. If I use the interpreter VM to trace the image, then run the cloned image under Cog, it does not work. If I run the same cloned image on an interpreter VM, it works. After the cloned image has been saved from an interpreter VM, it can be used with Cog. I do not know the reason for this, but that is what I am seeing. I am using Linux, but on a Mac you can probably use Ian's unix VM for Mac from http://squeakvm.org/unix/ and see if you get the same results. Dave

5 4

VM Maker: Android-Base-golubovsky.21.mcz
by commits＠source.squeak.org 01 Jan '12

01 Jan '12

Dmitry Golubovsky uploaded a new version of Android-Base to project VM Maker: http://source.squeak.org/VMMaker/Android-Base-golubovsky.21.mcz ==================== Summary ==================== Name: Android-Base-golubovsky.21 Author: golubovsky Time: 31 December 2011, 10:19:41 pm UUID: f37b7d8d-5491-478a-9aed-8dba4cb8e09b Ancestors: Android-Base-golubovsky.20 Copied to source.squeak.org: will now host here. ==================== Snapshot ==================== SystemOrganization addCategory: #'Android-Base'! Object subclass: #Android instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Android-Base'! !Android commentStamp: 'golubovsky 9/3/2011 22:24' prior: 0! Low-level interface to Android services! ----- Method: Android class>>briefMessage: (in category 'system primitives') ----- briefMessage: aString "display a brief message (a toast) by means of Android runtime" <primitive: 'primBriefMessage' module: 'AndroidPlugin'> self primitiveFailed.! ----- Method: Android class>>createShortcutFor:withLabel:andCommand:andIcon: (in category 'system primitives') ----- createShortcutFor: aPath withLabel: aString andCommand: aCmd andIcon: aForm "create a home screen shortcut for a given image" Android createShortcutFor: aPath withLabel: aString andCommand: aCmd iconWH: ((aForm width << 16) bitOr: (aForm height)) iconFlags: 0 iconBits: (aForm bits asByteArray).! ----- Method: Android class>>createShortcutFor:withLabel:andCommand:iconWH:iconFlags:iconBits: (in category 'system primitives') ----- createShortcutFor: aPath withLabel: aString andCommand: aCmd iconWH: xy iconFlags: flg iconBits: b "create a home screen shortcut for a given image" <primitive: 'primShortCut' module: 'AndroidPlugin'> self primitiveFailed. ! ----- Method: Android class>>createShortcutFor:withLabel:andIcon: (in category 'system primitives') ----- createShortcutFor: aPath withLabel: aString andIcon: aForm "create a home screen shortcut for a given image" Android createShortcutFor: aPath withLabel: aString andCommand: '' iconWH: ((aForm width << 16) bitOr: (aForm height)) iconFlags: 0 iconBits: (aForm bits asByteArray).! ----- Method: Android class>>getClipboardString (in category 'system primitives') ----- getClipboardString "get a string from Android clipboard" <primitive: 'primGetClipboardString' module: 'AndroidPlugin'> self primitiveFailed.! ----- Method: Android class>>inAndroid (in category 'system primitives') ----- inAndroid "answer true if running in Android" <primitive: 'primInAndroid' module: 'AndroidPlugin'> ^false.! ----- Method: Android class>>setPitch: (in category 'system primitives') ----- setPitch: aFloat "set TTS synthesized speech pitch" <primitive: 'primSetPitch' module: 'AndroidPlugin'> self primitiveFailed.! ----- Method: Android class>>setSpeechRate: (in category 'system primitives') ----- setSpeechRate: aFloat "set TTS synthesized speech rate" <primitive: 'primSetSpeechRate' module: 'AndroidPlugin'> self primitiveFailed.! ----- Method: Android class>>speak: (in category 'system primitives') ----- speak: aString "speak the given string via TTS" <primitive: 'primSpeak' module: 'AndroidPlugin'> self primitiveFailed.!

1 0

VM Maker: CMakeVMMaker-golubovsky.142.mcz
by commits＠source.squeak.org 01 Jan '12

01 Jan '12

Dmitry Golubovsky uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-golubovsky.142.mcz ==================== Summary ==================== Name: CMakeVMMaker-golubovsky.142 Author: golubovsky Time: 31 December 2011, 10:16:11 pm UUID: a76ea11e-3839-4c69-a3d1-5947855b06b6 Ancestors: CMakeVMMaker-golubovsky.141 Copy to source.squeak.org: will now host here. =============== Diff against CMakeVMMaker-IgorStasenko.136 =============== Item was changed: + SystemOrganization addCategory: #'CMakeVMMaker-Android'! SystemOrganization addCategory: #CMakeVMMaker! SystemOrganization addCategory: #'CMakeVMMaker-Unix'! SystemOrganization addCategory: #'CMakeVMMaker-Windows'! SystemOrganization addCategory: #'CMakeVMMaker-MacOS'! SystemOrganization addCategory: #'CMakeVMMaker-IOS'! SystemOrganization addCategory: #'CMakeVMMaker-FreeBSD'! Item was added: + CMakeVMGenerator subclass: #CMakeAndroidGenerator + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Android'! + + !CMakeAndroidGenerator commentStamp: 'golubovsky 7/27/2011 22:49' prior: 0! + This class inherits from CMakeGenerator and provides the same generation facilities as its parent, but output is more adjusted to the Android NDK requirements.! Item was added: + ----- Method: CMakeAndroidGenerator>>addDefinitions: (in category 'gmake commands') ----- + addDefinitions: aString + output + nextPutAll: ('COG_CFLAGS += ', aString); + cr + ! Item was added: + ----- Method: CMakeAndroidGenerator>>addSubdirectory: (in category 'gmake commands') ----- + addSubdirectory: aDir + + ^ self include: ('$(buildDir)/', aDir, '/', self outputFileName). + ! Item was added: + ----- Method: CMakeAndroidGenerator>>append:with: (in category 'gmake commands') ----- + append: variableName with: aValueString + + output + nextPutAll: (variableName, ' += ', aValueString); + cr + ! Item was added: + ----- Method: CMakeAndroidGenerator>>generate (in category 'code generation') ----- + generate + + "override this method to produce gmake syntax" + + output := String new writeStream. + + self printHeader. + + config setupDirectories: self. + + config preferredIncludes + do: [ :each | self includeDirectories: each ]. + self includeDirectories: self includeDirs. + config standardIncludes + do: [:each | self includeDirectories: each ]. + + self addDefinitions: config compilerFlags. + + config extraVMSettings: self. + + self append: #LOCAL_SRC_FILES with: self sources. + + self processInternalPlugins. + config setExtraTargetProperties: self. + + self saveFile. + ! Item was added: + ----- Method: CMakeAndroidGenerator>>generatePlugin:internal:extraRules: (in category 'plugins') ----- + generatePlugin: aPlugin internal: aBoolean extraRules: aBlock + " this method called back from plugin" + ^ CMakeAndroidPluginGenerator new + generate: aPlugin for: self internal: aBoolean extraRules: aBlock! Item was added: + ----- Method: CMakeAndroidGenerator>>include: (in category 'gmake commands') ----- + include: aFileName + output + nextPutAll: ('include ', aFileName); + cr + ! Item was added: + ----- Method: CMakeAndroidGenerator>>includeDirectories: (in category 'gmake commands') ----- + includeDirectories: aString + output + nextPutAll: ('COG_INCLUDE_DIRS += ', aString); + cr + ! Item was added: + ----- Method: CMakeAndroidGenerator>>includeDirs (in category 'sources management') ----- + includeDirs + + ^ '-I$(crossDir)/vm -I$(srcVMDir) -I$(targetPlatform)/vm -I$(buildDir)'.! Item was added: + ----- Method: CMakeAndroidGenerator>>outputFileName (in category 'accessing') ----- + outputFileName + "override this to set the file name to create" + ^ 'cogsources.mk'! Item was added: + ----- Method: CMakeAndroidGenerator>>printHeader (in category 'submakefile creation') ----- + printHeader + + self puts: '# This is automatically generated file using ', self configurationName, ' on ', + Date current asString, ' ' , Time current asString. + ! Item was added: + ----- Method: CMakeAndroidGenerator>>processInternalPlugins (in category 'plugins') ----- + processInternalPlugins + + | libs | + libs := OrderedCollection new. + + config internalPlugins collect: [:each | | plugin gen | + plugin := Smalltalk at: each. + gen := plugin generateFor: self internal: true. + gen doNotGenerate ifFalse: [ + libs add: plugin moduleName. + self addSubdirectory: plugin moduleName. + ]. + ]. + + self generateExportsH: libs. + ! Item was added: + ----- Method: CMakeAndroidGenerator>>set:to: (in category 'gmake commands') ----- + set: variableName to: aValueString + + output + nextPutAll: (variableName, ' := ', aValueString); + cr + ! Item was added: + ----- Method: CMakeAndroidGenerator>>sources (in category 'accessing') ----- + sources + + self set: #coreSources to: + (self append: '$(srcVMDir)/' toAll: config coreSources). + + self set: #platformVMSources to: + (self append: '$(targetPlatform)/vm/' toAll: config platformSources). + + + self set: #crossVMSources to: + (self append: '$(crossDir)/vm/' toAll: config crossSources). + + self set: #extraSources to: config extraSources. + + ^ '$(coreSources) $(crossVMSources) $(platformVMSources) $(extraSources)'! Item was added: + CMakePluginGenerator subclass: #CMakeAndroidPluginGenerator + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Android'! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>addCrossSources: (in category 'sources management') ----- + addCrossSources: sources + + ^ self addSources: sources prefixed: '$(pluginCross)/' + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>addDefinitions: (in category 'gmake commands') ----- + addDefinitions: aString + output + nextPutAll: ('COG_CFLAGS += ', aString); + cr + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>addSources:prefixed: (in category 'sources management') ----- + addSources: aFileNames prefixed: aPrefix + + | names | + names := aFileNames inject: '' into: [:res :each | res , aPrefix, each, ' ' ]. + self append: #LOCAL_SRC_FILES with: names. + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>addSubdirectory: (in category 'gmake commands') ----- + addSubdirectory: aDir + + ^ self include: ('$(buildDir)/', aDir, '/', self outputFileName). + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>append:with: (in category 'gmake commands') ----- + append: variableName with: aValueString + + output + nextPutAll: (variableName, ' += ', aValueString); + cr + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>generate (in category 'gmake commands') ----- + generate + + | name | + output := String new writeStream. + + name := plugin moduleName. + self printHeader. + + self + set: #pluginName to: name; + set: #pluginSrc to: '$(srcPluginsDir)/', name; + set: #pluginCross to: '$(crossDir)/plugins/', name; + set: #pluginPlatform to: '$(targetPlatform)/plugins/', name. + + self addDefinitions: '-DSQUEAK_BUILTIN_PLUGIN'. + + self addSources: { name , '.c' } prefixed: '$(pluginSrc)/'. + + self includeDirectories: '-I$(pluginSrc) -I$(pluginCross) -I$(targetPlatform)/plugins/$(pluginName)'. + + self addDefinitions: vmGen config compilerFlags. + + " perform config's configureXYZ: message to apply per-plugin custom rules, if any " + + vmGen config configurePlugin: plugin with: self. + + extraRules ifNotNil: [ extraRules value: self ]. + + vmGen config extraPluginSettings: self. + + self saveFile.! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>generatePlugin:internal:extraRules: (in category 'plugins') ----- + generatePlugin: aPlugin internal: aBoolean extraRules: aBlock + doNotGenerate := false. + internal := aBoolean. + plugin := aPlugin. + vmGen := CMakeAndroidGenerator. + extraRules := aBlock. + + ^ self generate! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>include: (in category 'gmake commands') ----- + include: aFileName + output + nextPutAll: ('include ', aFileName); + cr + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>includeDirectories: (in category 'gmake commands') ----- + includeDirectories: aString + output + nextPutAll: ('COG_INCLUDE_DIRS += ', aString); + cr + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>includeDirs (in category 'sources management') ----- + includeDirs + + ^ '-I$(crossDir)/vm -I$(srcVMDir) -I$(targetPlatform)/vm -I$(buildDir)'.! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>outputFileName (in category 'accessing') ----- + outputFileName + "override this to set the file name to create" + ^ 'cogsources.mk'! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>printHeader (in category 'submakefile creation') ----- + printHeader + + self puts: '# This is automatically generated file using ', self configurationName, ' on ', + Date current asString, ' ' , Time current asString. + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>processInternalPlugins (in category 'plugins') ----- + processInternalPlugins + + | libs | + libs := OrderedCollection new. + + config internalPlugins collect: [:each | | plugin gen | + plugin := Smalltalk at: each. + gen := plugin generateFor: self internal: true. + gen doNotGenerate ifFalse: [ + libs add: plugin moduleName. + self addSubdirectory: plugin moduleName. + ]. + ]. + + self generateExportsH: libs. + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>set:to: (in category 'gmake commands') ----- + set: variableName to: aValueString + + output + nextPutAll: (variableName, ' := ', aValueString); + cr + ! Item was added: + ----- Method: CMakeAndroidPluginGenerator>>sources (in category 'accessing') ----- + sources + + self set: #coreSources to: + (self append: '$(srcVMDir)/' toAll: config coreSources). + + self set: #platformVMSources to: + (self append: '$(targetPlatform)/vm/' toAll: config platformSources). + + + self set: #crossVMSources to: + (self append: '$(crossDir)/vm/' toAll: config crossSources). + + self set: #extraSources to: config extraSources. + + ^ '$(coreSources) $(crossVMSources) $(platformVMSources) $(extraSources)'! Item was added: + ----- Method: CMakeGenScripts class>>generateCogMacOS (in category 'as yet unclassified') ----- + generateCogMacOS + " generate sources for Stack Interpreter of Mac OS" + | top | + top := FileDirectory default containingDirectory. + + VMMaker + generate: CoInterpreter + to: (top / 'src') fullName + platformDir: ( top / 'platforms') fullName + excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin + FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin). + + CogMacOSConfig generate. + + ! Item was added: + ----- Method: CMakeGenScripts class>>generateCogSources (in category 'sources generation') ----- + generateCogSources + " self generateCogSources " + + " generate sources for CoInterpreter" + + | top | + + CogRTLOpcodes initialize. + CogIA32Compiler initialize. + + top := FileDirectory default containingDirectory. + + VMMaker + generate: CoInterpreter + and: StackToRegisterMappingCogit + to: (top / 'src') fullName + platformDir: ( top / 'platforms') fullName + excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin + FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin NewsqueakIA32ABIPlugin + NewsqueakIA32ABIPluginAttic). + ! Item was added: + ----- Method: CMakeGenScripts class>>generateCogSources: (in category 'sources generation') ----- + generateCogSources: config + " self generateCogSources " + + " generate sources for CoInterpreter" + + | top src | + + CogRTLOpcodes initialize. + CogIA32Compiler initialize. + + top := config topDir. + src := config srcDir assureExistence fullName. + + VMMaker + generate: CoInterpreter + and: StackToRegisterMappingCogit + to: src + platformDir: ( top / 'platforms') fullName + excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin + FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin NewsqueakIA32ABIPlugin + NewsqueakIA32ABIPluginAttic). + ! Item was added: + ----- Method: CMakeGenScripts class>>generateCogSourcesEmm40 (in category 'sources generation') ----- + generateCogSourcesEmm40 + " self generateCogSourcesEmm40 " + + + " generate sources for CoInterpreter" + + | top | + + CogRTLOpcodes initialize. + CogIA32Compiler initialize. + + top := FileDirectory default containingDirectory. + + VMMaker + generate: CoInterpreter + and: StackToRegisterMappingCogit + to: (top / 'src') fullName + platformDir: ( top / 'platforms') fullName + excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin + FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin NewsqueakIA32ABIPlugin + NewsqueakIA32ABIPluginAttic). + ! Item was added: + ----- Method: CMakeGenScripts class>>generateStackMacOS (in category 'as yet unclassified') ----- + generateStackMacOS + " generate sources for Stack Interpreter of Mac OS" + self generateStackSources. + + StackMacOSConfig generate. + + ! Item was added: + ----- Method: CMakeGenScripts class>>generateStackSources (in category 'sources generation') ----- + generateStackSources + " generate sources for Stack Interpreter of Mac OS" + | top | + top := FileDirectory default containingDirectory. + + VMMaker + generate: StackInterpreter + to: (top / 'src') fullName + platformDir: ( top / 'platforms') fullName + excluding: #(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin + FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin). + + + + ! Item was added: + ----- Method: CMakeVMGenerator>>setupMacros: (in category 'as yet unclassified') ----- + setupMacros: gen + self config cMakeMacros + ifNotNil: [ :macros | gen puts: macros ]! Item was added: + ----- Method: CPlatformConfig>>cMakeMacros (in category 'accessing') ----- + cMakeMacros + ^nil ! Item was added: + ----- Method: CPlatformConfig>>generateStackSources (in category 'source generation') ----- + generateStackSources + " generate sources for Stack Interpreter" + + StackInterpreter initialize. + + VMMaker + generate: StackInterpreter + to: self srcDir fullName + platformDir: self platformsDir fullName + excluding: #(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin + FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin).! Item was added: + ----- Method: CogMacOSConfig>>generateSourceFiles (in category 'source files') ----- + generateSourceFiles + + ^ CMakeGenScripts generateCogSources: self! Item was added: + ----- Method: MacOSConfig>>cMakeMacros (in category 'accessing') ----- + cMakeMacros + ^'macro(add_framework appname fwname) + find_library(FRAMEWORK_${fwname} + NAMES ${fwname} + PATHS ${CMAKE_OSX_SYSROOT}/System/Library + PATH_SUFFIXES Frameworks + NO_DEFAULT_PATH) + if( ${FRAMEWORK_${fwname}} STREQUAL FRAMEWORK_${fwname}-NOTFOUND) + message(ERROR ": Framework ${fwname} not found") + else() + include_directories(SYSTEM /System/Library/Frameworks/${fwname}.framework/Headers) + target_link_libraries(${appname} ${FRAMEWORK_${fwname}}) + endif() + endmacro(add_framework)' ! Item was added: + CPlatformConfig subclass: #StackEvtAndroidConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Android'! + + !StackEvtAndroidConfig commentStamp: 'golubovsky 7/24/2011 22:47' prior: 0! + A class to configure the Event-driven Stack Cog for Android. This configuration does not lead to building an executable; rather it prepares the source tree to be plugged into the jni subdirectory of an Android project.! Item was added: + ----- Method: StackEvtAndroidConfig>>compilerFlags (in category 'source generation') ----- + compilerFlags + "Compiler flags for Android. Leave empty for now" + ^ ' -DDEBUG=22 '! Item was added: + ----- Method: StackEvtAndroidConfig>>configH (in category 'source files') ----- + configH + " right now its borrowed directly from unix, but likely will change" + ^ ' + #ifndef __sq_config_h + #define __sq_config_h + + /* explicit image width */ + + #define HAVE_INTERP_H 1 + + /* package options */ + + #define USE_X11 1 + #define USE_X11_GLX 1 + /* #undef USE_QUARTZ */ + /* #undef USE_QUARTZ_CGL */ + /* #undef USE_RFB */ + + /* libraries */ + + /* #undef HAVE_LIBX11 */ + /* #undef HAVE_LIBXEXT */ + #define HAVE_LIBDL 1 + /* #undef HAVE_DYLD */ + /* #undef HAVE_LIBFFI */ + /* #undef HAVE_ICONV */ + + /* #undef USE_AUDIO_NONE */ + /* #undef USE_AUDIO_SUN */ + /* #undef USE_AUDIO_NAS */ + /* #undef USE_AUDIO_OSS */ + /* #undef USE_AUDIO_MACOSX */ + /* #undef OSS_DEVICE */ + + /* header files */ + + #define HAVE_UNISTD_H 1 + /* #undef NEED_GETHOSTNAME_P */ + + #define HAVE_DIRENT_H 1 + /* #undef HAVE_SYS_NDIR_H */ + /* #undef HAVE_SYS_DIR_H */ + /* #undef HAVE_NDIR_H */ + + #define HAVE_SYS_TIME_H 1 + #define TIME_WITH_SYS_TIME 1 + + /* #undef HAVE_SYS_FILIO_H */ + + /* #undef HAVE_SYS_AUDIOIO_H */ + /* #undef HAVE_SUN_AUDIOIO_H */ + + #define HAVE_PTY_H 1 + /* #undef HAVE_UTIL_H */ + /* #undef HAVE_LIBUTIL_H */ + #define HAVE_STROPTS_H 1 + + #define HAVE_GL_GL_H 1 + /* #undef HAVE_OPENGL_GL_H */ + + /* #undef NEED_SUNOS_H */ + + /* system calls/library functions */ + + #define AT_EXIT atexit + + #define HAVE_TZSET 1 + + #define HAVE_OPENPTY 1 + /* #undef HAVE_UNIX98_PTYS */ + + #define HAVE_SNPRINTF 1 + /* #undef HAVE___SNPRINTF */ + + #define HAVE_MMAP 1 + + /* #undef HAVE_DYLD */ + + #define HAVE_LANGINFO_CODESET 1 + + #define HAVE_ALLOCA 1 + #define HAVE_ALLOCA_H 1 + + #define HAVE_UNSETENV 1 + + #define HAVE_NANOSLEEP 1 + + /* widths of primitive types */ + + #define SIZEOF_INT 4 + #define SIZEOF_LONG 4 + #define SIZEOF_LONG_LONG 8 + #define SIZEOF_VOID_P 4 + + /* structures */ + + #define HAVE_TM_GMTOFF 1 + #define HAVE_TIMEZONE 1 + + /* typedefs */ + + /* #undef size_t */ + /* #undef socklen_t */ + + #define squeakInt64 long long + + /* architecture */ + + #define OS_TYPE "unix" + + #define VM_HOST "i686-pc-linux-gnu" + #define VM_HOST_CPU "i686" + /* #undef VM_HOST_VENDOR */ + #define VM_HOST_OS "linux-gnu" + #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__ + + /* #undef WORDS_BIGENDIAN */ + /* #undef DOUBLE_WORD_ALIGNMENT */ + + /* damage containment */ + + /* #undef DARWIN */ + + #ifdef NEED_SUNOS_H + # include "sunos.h" + #endif + + /* other configured variables */ + + #define SQ_VERSION "3.9a-7024" + #define VM_VERSION "3.9-7" + #define VM_MODULE_PREFIX "" + /* #undef VM_DLSYM_PREFIX */ + #define VM_X11DIR "" + + /* avoid dependencies on glibc2.3 */ + + #define HAVE_FEATURES_H 1 + + #if defined(HAVE_FEATURES_H) + # include "glibc.h" + #endif + + + /* used by UUID plugin: */ + + #define HAVE_UUID_H 1 + + #endif /* __sq_config_h */ + + '! Item was added: + ----- Method: StackEvtAndroidConfig>>configureFileCopyPlugin: (in category 'plugin extra rules') ----- + configureFileCopyPlugin: maker + "extra rules for DropPlugin" + + maker addPlatformSources: #( 'sqAndroidFileCopyPlugin.c') + ! Item was added: + ----- Method: StackEvtAndroidConfig>>configureFilePlugin: (in category 'plugin extra rules') ----- + configureFilePlugin: maker + "extra rules for FilePlugin" + + super configureFilePlugin: maker. + + maker addPlatformSources: #( 'sqAndroidFile.c')! Item was added: + ----- Method: StackEvtAndroidConfig>>configureFloatMathPlugin: (in category 'plugin extra rules') ----- + configureFloatMathPlugin: maker + "extra rules for FloatMathPlugin" + + maker addCrossSources: #( + 'acos.c' 'acosh.c' 'asin.c' 'asinh.c' 'atan.c' 'atan2.c' 'atanh.c' + 'copysign.c' 'cos.c' 'cosh.c' 'exp.c' 'expm1.c' 'finite.c' 'fmod.c' + 'hypot.c' 'isnan.c' 'k_cos.c' 'k_rem_pio2.c' 'k_sin.c' 'k_tan.c' 'ldexp.c' + 'log.c' 'log10.c' 'log1p.c' 'modf.c' 'pow.c' 'rem_pio2.c' 'rint.c' + 'scalb.c' 'scalbn.c' 'sin.c' 'sinh.c' 'sqrt.c' 'tan.c' 'tanh.c' ). + + + "according to http://www.netlib.org/fdlibm/readme + it should be compiled with no optimizations" + maker addDefinitions: '-O0'. + + " compile with -D__LITTLE_ENDIAN + This macro is set automatically in fdlibm.h when compiled ith -m32 but + not when compiled with -m64 (Nicolas Cellier) + " + self isLittleEndian ifTrue: [ + maker addDefinitions: '-D__LITTLE_ENDIAN=1' ]. + + maker addDefinitions: '-DNO_ISNAN'. + + + ! Item was added: + ----- Method: StackEvtAndroidConfig>>configureJoystickTabletPlugin: (in category 'plugin extra rules') ----- + configureJoystickTabletPlugin: maker + "extra rules for JoystickTabletPlugin" + + super configureJoystickTabletPlugin: maker. + maker addPlatformSources: + #( 'sqAndroidJoystickTablet.c' ) + ! Item was added: + ----- Method: StackEvtAndroidConfig>>configureSecurityPlugin: (in category 'plugin extra rules') ----- + configureSecurityPlugin: maker + "extra rules for MIDIPlugin" + + super configureSecurityPlugin: maker. + + maker addPlatformSources: #( 'sqAndroidSecurity.c')! Item was added: + ----- Method: StackEvtAndroidConfig>>configureSocketPlugin: (in category 'plugin extra rules') ----- + configureSocketPlugin: maker + "extra rules for SocketPlugin" + + maker addPlatformSources: #( 'sqAndroidSocket.c')! Item was added: + ----- Method: StackEvtAndroidConfig>>coreSources (in category 'source files') ----- + coreSources + "files to include from src/vm dir" + + ^ #( + 'gcc3x-interp.c' + )! Item was added: + ----- Method: StackEvtAndroidConfig>>crossSources (in category 'source files') ----- + crossSources + ^#( + 'sqHeapMap.c' + 'sqNamedPrims.c' + 'sqVirtualMachine.c' + )! Item was added: + ----- Method: StackEvtAndroidConfig>>defaultExternalPlugins (in category 'plugins') ----- + defaultExternalPlugins + ^ #( + )! Item was added: + ----- Method: StackEvtAndroidConfig>>defaultInternalPlugins (in category 'plugins') ----- + defaultInternalPlugins + " took from unixbuild/bld/plugins.int" + ^ #( + AndroidPlugin + BitBltSimulation "BitBltPlugin" + BalloonEnginePlugin "B2DPlugin" + BMPReadWriterPlugin + CroquetPlugin + DSAPlugin "DSAPrims" + FFTPlugin + FileCopyPlugin + FilePlugin + FloatArrayPlugin + FloatMathPlugin + JoystickTabletPlugin + JPEGReaderPlugin + LargeIntegersPlugin "LargeIntegers" + Matrix2x3Plugin + RePlugin + SecurityPlugin + JPEGReadWriter2Plugin + SocketPlugin + MiscPrimitivePlugin + DeflatePlugin "ZipPlugin" + )! Item was added: + ----- Method: StackEvtAndroidConfig>>extraVMSettings: (in category 'source generation') ----- + extraVMSettings: maker + | versionC | + self generateConfigH. + + "add a generated version.c" + + versionC := 'version.c'. + + maker + puts: '$(buildDir)/',versionC, ':' ; + puts: ({Character tab}, '$(platformsDir)/android/config/verstamp ', '$(buildDir)/', versionC,' gcc'); + puts: {Character cr}; + puts: ('LOCAL_SRC_FILES += $(buildDir)/', versionC); + puts: {Character cr}. + . + ! Item was added: + ----- Method: StackEvtAndroidConfig>>fixLineEndsOf: (in category 'utils') ----- + fixLineEndsOf: string + ^ string copyReplaceAll: String cr with: String lf! Item was added: + ----- Method: StackEvtAndroidConfig>>generate (in category 'source generation') ----- + generate + ^ CMakeAndroidGenerator generate: self + + ! Item was added: + ----- Method: StackEvtAndroidConfig>>generateConfigH (in category 'source files') ----- + generateConfigH + "will fix that later" + self write: self configH toFile: 'config.h'! Item was added: + ----- Method: StackEvtAndroidConfig>>interpreterClass (in category 'source generation') ----- + interpreterClass + ^ StackEvtAndroidInterpreter! Item was added: + ----- Method: StackEvtAndroidConfig>>mkFileList:baseDir: (in category 'utils') ----- + mkFileList: anArray baseDir: aDir + "answer the concatenated contents of the array interspersed with backslash-newline sequences" + ^ (anArray collect: [ :s | aDir, s]) inject: '' into: [ :s :n | s , #($\), {Character cr}, n ].! Item was added: + ----- Method: StackEvtAndroidConfig>>outputDir (in category 'directories') ----- + outputDir + + "the directory where built binaries will be stored - for now it is copied from CogFamilyUnixConfig" + ^ outputDir ifNil: [ outputDir := (self buildDir containingDirectory fullName , '/', self outputDirName) ] + ! Item was added: + ----- Method: StackEvtAndroidConfig>>platformName (in category 'source generation') ----- + platformName + ^ 'android'! Item was added: + ----- Method: StackEvtAndroidConfig>>platformSources (in category 'source files') ----- + platformSources + "files added from platform/android/vm dir " + ^ #( + 'aio.c' + 'debug.c' + 'osExports.c' + 'sqAndroidCharConv.c' + 'sqAndroidExternalPrims.c' + 'sqAndroidEvtBeat.c' + 'sqAndroidEvtMain.c' + 'sqAndroidMemory.c' + 'sqAndroidVMProfile.c' + 'sqAndroidSemaphores.c' + 'sqAndroidSoundNull.c' + 'sqAndroidDisplay.c' + )! Item was added: + ----- Method: StackEvtAndroidConfig>>prepareForGeneration (in category 'source generation') ----- + prepareForGeneration + + "force using LF on Macs" + CrLfFileStream defaultToLF. + + ^ self prepareForStackVMGeneration + ! Item was added: + ----- Method: StackEvtAndroidConfig>>setupDirectories: (in category 'directories') ----- + setupDirectories: gen + "same logic as the super has, but use gmake syntax instead of cmake" + | dirsInclude | + + " write the directories in separate include file" + dirsInclude := gen captureOutputDuring: [ + gen + set: #topDir to: ('$(ROOT)/', self topDir fullName); + set: #buildDir to: (self buildDir ifNil: ['$(topDir)/build'] ifNotNil: ['$(ROOT)/', self buildDir fullName] ); + set: #platformsDir to: ('$(ROOT)/', self platformsDir); + set: #srcDir to: ('$(ROOT)/', self srcDir); + set: #srcPluginsDir to: (pluginsDir ifNil: [ '$(srcDir)/plugins' ]); + set: #srcVMDir to: '$(srcDir)/vm'; + set: #platformName to: self platformName; + set: #targetPlatform to: '$(platformsDir)/$(platformName)'; + set: #crossDir to: '$(platformsDir)/Cross'; + set: #platformVMDir to: '$(targetPlatform)/vm'. + ]. + + self write: dirsInclude toFile: 'cogdirs.mk' + ! Item was added: + CogUnixConfig subclass: #StackEvtUnixConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! + + !StackEvtUnixConfig commentStamp: 'golubovsky 7/7/2011 22:38' prior: 0! + This is a concrete class which generates an event-driven StackVM for Unix. + + Usage: + StackEvtUnixConfig generateWithSources + + An event-driven Stack VM is an experiment to make VM return to the host process each time it asks for an event. + If there are events to process, the host resumes VM, otherwise VM does not get control until any event is available. + + Fore more information, check the class comments of all the superclasses. + ! Item was added: + ----- Method: StackEvtUnixConfig>>coreSources (in category 'as yet unclassified') ----- + coreSources + "files to include from src/vm dir" + + ^ #( + 'gcc3x-interp.c' + )! Item was added: + ----- Method: StackEvtUnixConfig>>crossSources (in category 'as yet unclassified') ----- + crossSources + "answer the same set of source files except that sqTicker.c is dropped" + + ^ super crossSources select: [ :file | (file = 'sqTicker.c') not ]. + + ! Item was added: + ----- Method: StackEvtUnixConfig>>executableName (in category 'accessing') ----- + executableName + "the name of the VM executable" + ^ 'EventVM'.! Item was added: + ----- Method: StackEvtUnixConfig>>interpreterClass (in category 'source generation') ----- + interpreterClass + ^ StackEvtInterpreter! Item was added: + ----- Method: StackEvtUnixConfig>>platformSources (in category 'as yet unclassified') ----- + platformSources + "answer the same set of source files except that sqUnixMain.c is replaced with sqUnixEvtMain.c, + sqUnixHeartbeat.c is replaced with sqUnixEvtBeat.c" + + ^ super platformSources collect: [ :file | (file = 'sqUnixMain.c') + ifTrue: 'sqUnixEvtMain.c' + ifFalse: [(file = 'sqUnixHeartbeat.c') + ifTrue: 'sqUnixEvtBeat.c' + ifFalse: file] + ]. + + ! Item was added: + ----- Method: StackEvtUnixConfig>>prepareForGeneration (in category 'source generation') ----- + prepareForGeneration + + "force using LF on Macs" + CrLfFileStream defaultToLF. + + ^ self prepareForStackVMGeneration + ! Item was added: + StackEvtUnixConfig subclass: #StackEvtUnixDebugConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! Item was added: + ----- Method: StackEvtUnixDebugConfig>>compilerFlags (in category 'compiler flags') ----- + compilerFlags + + ^ self commonCompilerFlags, ' ' ,self compilerFlagsDebug!

1 0

VM Maker: VMMaker-oscog-golubovsky.135.mcz
by commits＠source.squeak.org 01 Jan '12

01 Jan '12

Dmitry Golubovsky uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-golubovsky.135.mcz ==================== Summary ==================== Name: VMMaker-oscog-golubovsky.135 Author: golubovsky Time: 31 December 2011, 10:09:43 pm UUID: 960c38bd-0efc-433e-8f7f-4e4e2a341d02 Ancestors: VMMaker-oscog-golubovsky.133 Added primClipboardString: obtains a string from Android clipboard if there is any. Returns an empty string if nothing is available. =============== Diff against VMMaker-oscog-IgorStasenko.123 =============== Item was changed: SystemOrganization addCategory: #'VMMaker-Building'! SystemOrganization addCategory: #'VMMaker-JIT'! SystemOrganization addCategory: #'VMMaker-Interpreter'! SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'! SystemOrganization addCategory: #'VMMaker-JITSimulation'! SystemOrganization addCategory: #'VMMaker-Translation to C'! SystemOrganization addCategory: #'VMMaker-Support'! SystemOrganization addCategory: #'VMMaker-PostProcessing'! SystemOrganization addCategory: #'VMMaker-MemoryManager'! SystemOrganization addCategory: #'VMMaker-MemoryManagerSimulation'! SystemOrganization addCategory: #'VMMaker-Multithreading'! SystemOrganization addCategory: #'VMMaker-Tests'! SystemOrganization addCategory: #'VMMaker-Plugins'! SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'! + SystemOrganization addCategory: #'VMMaker-Plugins-Android'! SystemOrganization addCategory: #'VMMaker-Plugins-Alien'! Item was added: + InterpreterPlugin subclass: #AndroidPlugin + instanceVariableNames: '' + classVariableNames: 'CogEnv CogVM' + poolDictionaries: '' + category: 'VMMaker-Plugins-Android'! + + !AndroidPlugin commentStamp: 'golubovsky 9/3/2011 21:20' prior: 0! + This is a plugin for the Android port of Cog providing generic interface to Android Java runtime.! Item was added: + ----- Method: AndroidPlugin class>>declareCVarsIn: (in category 'translation') ----- + declareCVarsIn: aCCodeGenerator + + aCCodeGenerator addHeaderFile: '<jni.h>'. + + ! Item was added: + ----- Method: AndroidPlugin>>primBriefMessage (in category 'system primitives') ----- + primBriefMessage + | msg vmcls vmobj bmmeth jmsg | + <var: 'msg' type: 'char *'> + <var: 'vmcls' type: 'jclass'> + <var: 'vmobj' type: 'jobject'> + <var: 'bmmeth' type: 'jmethodID'> + <var: 'jmsg' type: 'jstring'> + <export: true> + msg := self stringArgumentAt: 0. + vmcls := self getVMClass. + vmcls ifNil: [^ interpreterProxy primitiveFail]. + vmobj := self getVMObject. + vmobj ifNil: [^ interpreterProxy primitiveFail]. + bmmeth := self getMethod: 'briefMessage' withSig: '(Ljava/lang/String;)V' inClass: vmcls. + bmmeth ifNil: [^ interpreterProxy primitiveFail]. + jmsg := self asJavaString: msg. + jmsg ifNil: [^ interpreterProxy primitiveFail]. + self callVoidMethod: bmmeth On: vmobj with:jmsg. + interpreterProxy pop: 1. "leave rcvr on stack" + ! Item was added: + ----- Method: AndroidPlugin>>primGetClipboardString (in category 'system primitives') ----- + primGetClipboardString + | vmcls vmobj bmmeth jmsg res size oop ptr | + <var: 'res' type: 'char *'> + <var: 'vmcls' type: 'jclass'> + <var: 'vmobj' type: 'jobject'> + <var: 'bmmeth' type: 'jmethodID'> + <export: true> + vmcls := self getVMClass. + vmcls ifNil: [^ interpreterProxy primitiveFail]. + vmobj := self getVMObject. + vmobj ifNil: [^ interpreterProxy primitiveFail]. + bmmeth := self getMethod: 'getClipboardString' withSig: '()Ljava/lang/String;' inClass: vmcls. + bmmeth ifNil: [^ interpreterProxy primitiveFail]. + res := self callStringMethod: bmmeth On: vmobj with: 0. + size := self strlen: res. + oop := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: size. + ptr := interpreterProxy firstIndexableField: oop. + self memc: ptr p: res y: size. + self free: res. + interpreterProxy pop: 1. + interpreterProxy push: oop. + ! Item was added: + ----- Method: AndroidPlugin>>primInAndroid (in category 'system primitives') ----- + primInAndroid + "return true if running in Android. outside Android this primitive fails" + + <export: true> + interpreterProxy pop: 1; pushBool: true.! Item was added: + ----- Method: AndroidPlugin>>primSetPitch (in category 'system primitives') ----- + primSetPitch + | pitch vmcls vmobj bmmeth jmsg res | + <var: 'pitch' type: 'float'> + <var: 'vmcls' type: 'jclass'> + <var: 'vmobj' type: 'jobject'> + <var: 'bmmeth' type: 'jmethodID'> + <export: true> + pitch := interpreterProxy stackFloatValue: 0. + vmcls := self getVMClass. + vmcls ifNil: [^ interpreterProxy primitiveFail]. + vmobj := self getVMObject. + vmobj ifNil: [^ interpreterProxy primitiveFail]. + bmmeth := self getMethod: 'setPitch' withSig: '(F)I' inClass: vmcls. + bmmeth ifNil: [^ interpreterProxy primitiveFail]. + res := self callIntMethod: bmmeth On: vmobj with: pitch. + interpreterProxy pop: 2. + interpreterProxy pushInteger: res. + ! Item was added: + ----- Method: AndroidPlugin>>primSetSpeechRate (in category 'system primitives') ----- + primSetSpeechRate + | rate vmcls vmobj bmmeth jmsg res | + <var: 'rate' type: 'float'> + <var: 'vmcls' type: 'jclass'> + <var: 'vmobj' type: 'jobject'> + <var: 'bmmeth' type: 'jmethodID'> + <export: true> + rate := interpreterProxy stackFloatValue: 0. + vmcls := self getVMClass. + vmcls ifNil: [^ interpreterProxy primitiveFail]. + vmobj := self getVMObject. + vmobj ifNil: [^ interpreterProxy primitiveFail]. + bmmeth := self getMethod: 'setSpeechRate' withSig: '(F)I' inClass: vmcls. + bmmeth ifNil: [^ interpreterProxy primitiveFail]. + res := self callIntMethod: bmmeth On: vmobj with: rate. + interpreterProxy pop: 2. + interpreterProxy pushInteger: res. + ! Item was added: + ----- Method: AndroidPlugin>>primShortCut (in category 'system primitives') ----- + primShortCut + "path label cmd width height bits" + | vmcls vmobj meth imgpath jpath imglabel jlabel cmd jcmd width height bits bitlen bitptr jbits | + <var: 'imgpath' type: 'char *'> + <var: 'vmcls' type: 'jclass'> + <var: 'vmobj' type: 'jobject'> + <var: 'meth' type: 'jmethodID'> + <var: 'jpath' type: 'jstring'> + <export: true> + imgpath := self stringArgumentAt: 5. + jpath := self asJavaString: imgpath. + jpath ifNil: [^ interpreterProxy primitiveFail]. + imglabel := self stringArgumentAt: 4. + jlabel := self asJavaString: imglabel. + jlabel ifNil: [^ interpreterProxy primitiveFail]. + cmd := self stringArgumentAt: 3. + jcmd := self asJavaString: cmd. + jcmd ifNil: [^ interpreterProxy primitiveFail]. + width := interpreterProxy stackIntegerValue: 2. + height := interpreterProxy stackIntegerValue: 1. + bits := interpreterProxy stackValue: 0. + bits ifNotNil: [ + (interpreterProxy isBytes: bits) ifFalse: [^ interpreterProxy primitiveFail]. + bitlen := interpreterProxy byteSizeOf: bits. + bitptr := interpreterProxy firstIndexableField: bits. + jbits := self asJavaByte: bitptr Array: bitlen. + jbits ifNil: [^ interpreterProxy primitiveFail]. + ] ifNil: [ + jbits := nil. + ]. + vmcls := self getVMClass. + vmcls ifNil: [^ interpreterProxy primitiveFail]. + vmobj := self getVMObject. + vmobj ifNil: [^ interpreterProxy primitiveFail]. + meth := self getMethod: 'imageShortCut' withSig: '(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II[B)V' + inClass: vmcls. + meth ifNil: [^ interpreterProxy primitiveFail]. + self callVoidMethod: meth On: vmobj with: jpath m: jlabel a: jcmd n: width y: height args: jbits. + interpreterProxy pop: 6. "leave rcvr on stack" + ! Item was added: + ----- Method: AndroidPlugin>>primSpeak (in category 'system primitives') ----- + primSpeak + | msg vmcls vmobj bmmeth jmsg res | + <var: 'msg' type: 'char *'> + <var: 'vmcls' type: 'jclass'> + <var: 'vmobj' type: 'jobject'> + <var: 'bmmeth' type: 'jmethodID'> + <var: 'jmsg' type: 'jstring'> + <export: true> + msg := self stringArgumentAt: 0. + vmcls := self getVMClass. + vmcls ifNil: [^ interpreterProxy primitiveFail]. + vmobj := self getVMObject. + vmobj ifNil: [^ interpreterProxy primitiveFail]. + bmmeth := self getMethod: 'speak' withSig: '(Ljava/lang/String;)I' inClass: vmcls. + bmmeth ifNil: [^ interpreterProxy primitiveFail]. + jmsg := self asJavaString: msg. + jmsg ifNil: [^ interpreterProxy primitiveFail]. + res := self callIntMethod: bmmeth On: vmobj with:jmsg. + interpreterProxy pop: 2. + interpreterProxy pushInteger: res. + ! Item was added: + ----- Method: AndroidPlugin>>stringArgumentAt: (in category 'accessing') ----- + stringArgumentAt: anOffset + "To be inlined: common operations to obtain a string argument value at given stack offset. + The string returned is null-terminated, and alloca-d, so will be freed automatically" + | pointer index size alc | + <inline: true> + <var: 'alc' type: 'void *'> + <returnTypeC: #'void *'> + pointer := interpreterProxy stackValue: anOffset. + (interpreterProxy isBytes: pointer) + ifFalse: [^ interpreterProxy primitiveFail]. + index := interpreterProxy firstIndexableField: pointer. + size := interpreterProxy byteSizeOf: pointer. + alc := self alloca: (size + 1). + self mem: alc se: 0 t: (size + 1). + self mem: alc cp: index y: size. + ^alc. + ! Item was added: + ----- Method: CoInterpreter>>cePushActiveContext (in category 'trampolines') ----- + cePushActiveContext + <api> + "Since the trampoline checks for marriage we should only be here for a single frame." + self assert: (self isMachineCodeFrame: framePointer). + self assert: (self frameHasContext: framePointer) not. + "Do *not* include the return pc in the stack contents; hence + BytesPerWord" + ^self marryFrame: framePointer SP: stackPointer + BytesPerWord! Item was added: + ----- Method: CoInterpreter>>mframeReceiverExport (in category 'frame access') ----- + mframeReceiverExport + <api> + ^stackPages longAt: framePointer + FoxMFReceiver! Item was added: + ----- Method: CoInterpreter>>noInlineTemporary:in: (in category 'internal interpreter access') ----- + noInlineTemporary: offset in: theFP + <var: #theFP type: #'char *'> + <inline: false> + ^self temporary: offset in: theFP! Item was added: + ----- Method: CogVMSimulator>>endPCOf: (in category 'debug printing') ----- + endPCOf: aMethod + | pc end latestContinuation prim | + pc := latestContinuation := self startPCOfMethod: aMethod. + (prim := self primitiveIndexOf: aMethod) > 0 ifTrue: + [(self isQuickPrimitiveIndex: prim) ifTrue: + [^pc - 1]]. + end := objectMemory byteSizeOf: aMethod. + [pc <= end] whileTrue: + [| byte byte2 byte3 byte4 type offset jumpTarget | + byte := objectMemory fetchByte: pc ofObject: aMethod. + type := byte // 16. + offset := byte \\ 16. + (type =7 and: [offset >= 8 and: [pc >= latestContinuation]]) ifTrue:"Return bytecodes (possible lastPC here)" + [end := pc]. + (type = 8 and: [offset = 15]) ifTrue: "closure creation; update latest continuation" + [byte3 := objectMemory fetchByte: pc + 2 ofObject: aMethod. + byte4 := objectMemory fetchByte: pc + 3 ofObject: aMethod. + jumpTarget := (byte3 * 256) + byte4 + pc + 4. + jumpTarget > latestContinuation ifTrue: [latestContinuation := jumpTarget]]. + type=9 ifTrue: "Short jumps (need to update latest continuation" + [jumpTarget := (offset < 8 ifTrue: [offset] ifFalse: [offset - 8]) + pc + 2. + jumpTarget > latestContinuation ifTrue: [latestContinuation := jumpTarget]]. + type=10 ifTrue: "Long jumps (need to update latest continuation)" + [byte2 := objectMemory fetchByte: pc + 1 ofObject: aMethod. + jumpTarget := (offset < 8 ifTrue: [offset - 4] ifFalse: [offset bitAnd: 3]) * 256 + byte2 + pc + 2. + jumpTarget > latestContinuation ifTrue: [latestContinuation := jumpTarget]]. + "Note we cannot skip by going to the latestContinuation because that may jump over jumps." + pc := type = 8 "extensions" + ifTrue: [pc + (#(2 2 2 2 3 2 2 1 1 1 2 1 3 3 3 4) at: byte \\ 16 + 1)] + ifFalse: [type = 10 "long jumps" + ifTrue: [pc + 2] + ifFalse: [pc + 1]]]. + ^end! Item was added: + ----- Method: Cogit>>ceImplicitReceiverFor: (in category 'in-line cacheing') ----- + ceImplicitReceiverFor: selector + "Cached implicit receiver implementation. Caller looks like + mov selector, ClassReg + call ceImplicitReceiver + br continue + Lclass .word + Lmixin: .word + continue: + If class matches class of receiver then mixin contains either 0 or the implicit receiver. + If mixin is 0, answer the actual receiver, otherwise mixin." + + | receiver retpc classpc mixinpc rcvrClass mixin | + receiver := coInterpreter mframeReceiverExport. + retpc := coInterpreter stackTop. + classpc := retpc + backEnd jumpShortByteSize. + mixinpc := retpc + backEnd jumpShortByteSize + BytesPerOop. + rcvrClass := objectMemory fetchClassOf: receiver. + rcvrClass ~= (backEnd unalignedLongAt: classpc) ifTrue: + [mixin := coInterpreter + implicitReceiverFor: receiver + mixin: coInterpreter mMethodClass + implementing: selector. + backEnd unalignedLongAt: classpc put: rcvrClass. + backEnd unalignedLongAt: mixinpc put: (mixin = receiver ifTrue: [0] ifFalse: [mixin]). + ^mixin]. + self breakOnImplicitReceiver ifTrue: + [self sendBreak: selector + BaseHeaderSize + point: (objectMemory lengthOf: selector) + receiver: nil]. + mixin := backEnd unalignedLongAt: mixinpc. + ^mixin = 0 ifTrue: [receiver] ifFalse: [mixin]! Item was added: + ----- Method: Cogit>>genPushActiveContextTrampoline (in category 'initialization') ----- + genPushActiveContextTrampoline + "Short-circuit the trampoline if a frame is already married." + | jumpSingle | + <var: #jumpSingle type: #'AbstractInstruction *'> + opcodeIndex := 0. + self MoveMw: FoxMethod r: FPReg R: TempReg. + self AndCq: MFMethodFlagHasContextFlag R: TempReg. + jumpSingle := self JumpZero: 0. + self MoveMw: FoxThisContext r: FPReg R: ReceiverResultReg. + self RetN: 0. + jumpSingle jmpTarget: self Label. + ^self genTrampolineFor: #cePushActiveContext asSymbol + called: 'cePushActiveContextTrampoline' + callJumpBar: true + numArgs: 0 + arg: nil + arg: nil + arg: nil + arg: nil + saveRegs: false + resultReg: ReceiverResultReg + appendOpcodes: true! Item was added: + StackEvtInterpreter subclass: #StackEvtAndroidInterpreter + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Interpreter'! + + !StackEvtAndroidInterpreter commentStamp: 'golubovsky 7/31/2011 13:19' prior: 0! + Unfortunately this class has not been documented yet. The class comment should describe the purpose of the class, its collaborations and its variables. We encourage you to fill up the following template. + + This is a subclass of the Stack Event Cog implementing Android-specific things.! Item was added: + ----- Method: StackEvtAndroidInterpreter>>cr (in category 'debug printing') ----- + cr + "In Android, prints the carriage return to the JNI debug log file." + <inline: true> + self print: '\n'! Item was added: + ----- Method: StackEvtAndroidInterpreter>>flush (in category 'debug printing') ----- + flush + ! Item was added: + ----- Method: StackEvtAndroidInterpreter>>isBigEnder (in category 'memory access') ----- + isBigEnder + "Ported from the classic VM as it works well on Android" + "Answer true (non-zero) if running on a big endian machine." + | endianness anInt cString len i | + <var: 'cString' type: 'char *'> + <var: 'endianness' declareC: 'static sqInt endianness = -1'> + (endianness == -1) ifFalse: [^ endianness]. "answer cached value" + len := self cCode: 'sizeof(anInt)' + inSmalltalk: [^ (Smalltalk endianness == #little) not]. + cString := self cCode: '(char *) &anInt' inSmalltalk: []. + i := 0. + [i < len] whileTrue: + [cString at: i put: i. + i := i + 1]. + endianness := anInt bitAnd: 255. + ^ endianness + ! Item was added: + ----- Method: StackEvtAndroidInterpreter>>methodArg: (in category 'debug printing') ----- + methodArg: index + "Like #stackValue: but access method arguments left-to-right" + index > argumentCount + 1 ifTrue:[ + self cCode: 'jprintf("[VM]: Attempt to access method args beyond range\n")'. + self printCallStack. + self primitiveFail. + ^0]. + ^self stackValue: argumentCount - index! Item was added: + ----- Method: StackEvtAndroidInterpreter>>noInlineTemporary:in: (in category 'indexing primitive support') ----- + noInlineTemporary: offset in: theFP + <var: #theFP type: #'char *'> + <inline: false> + ^self temporary: offset in: theFP! Item was added: + ----- Method: StackEvtAndroidInterpreter>>preambleCCode (in category 'translation support') ----- + preambleCCode + ^ + 'void printCallStack(void); + + /* Disable Intel compiler inlining of warning which is used for breakpoints */ + #pragma auto_inline off + void + warning(char *s) { /* Print an error message but don''t exit. */ + dprintf(4, "\n%s\n", s); + } + #pragma auto_inline on + + void + invalidCompactClassError(char *s) { /* Print a compact class index error message and exit. */ + static sqInt printingStack = true; /* not running at this point */ + + dprintf(3, "\nClass %s does not have the required compact class index\n", s); + exit(-1); + } + + /* + * Define sigsetjmp and siglongjmp to be the most minimal setjmp/longjmp available on the platform. + */ + #if WIN32 + # define sigsetjmp(jb,ssmf) setjmp(jb) + # define siglongjmp(jb,v) longjmp(jb,v) + #else + # define sigsetjmp(jb,ssmf) _setjmp(jb) + # define siglongjmp(jb,v) _longjmp(jb,v) + #endif + '! Item was added: + ----- Method: StackEvtAndroidInterpreter>>print: (in category 'debug printing') ----- + print: s + "In Android, prints the given string to the JNI debug log file." + <api> + <var: #s type: #'char *'> + self cCode: 'jniputstr(s)'.! Item was added: + ----- Method: StackEvtAndroidInterpreter>>printChar: (in category 'debug printing') ----- + printChar: aByte + <api> + "In Android, prints the given character to the JNI debug log file." + self jniputchar: aByte.! Item was added: + ----- Method: StackEvtAndroidInterpreter>>printFloat: (in category 'debug printing') ----- + printFloat: f + "For testing in Smalltalk, this method should be overridden in a subclass." + <cmacro: '(f) jprintf("%g", f)'> + self print: f! Item was added: + ----- Method: StackEvtAndroidInterpreter>>printHex: (in category 'debug printing') ----- + printHex: n + "Print n in hex, in the form ' 0x1234', padded to a width of 10 characters + in 32-bits ('0x' + 8 nibbles) or 18 characters in 64-bits ('0x' + 16 nibbles)" + <api> + | len buf | + <var: #buf declareC: 'char buf[35]'> "large enough for a 64-bit value in hex plus the null plus 16 spaces" + self cCode: 'memset(buf,'' '',34)' inSmalltalk: [buf := 'doh!!']. + len := self cCode: 'sprintf(buf + 2 + 2 * BytesPerWord, "0x%lx", (unsigned long)(n))'. + self cCode: 'jprintf("%s", buf + len)'. + len touch: buf! Item was added: + ----- Method: StackEvtAndroidInterpreter>>printNum: (in category 'debug printing') ----- + printNum: n + "For testing in Smalltalk, this method should be overridden in a subclass." + + self cCode: 'jprintf("%ld", (long) n)'.! Item was added: + ----- Method: StackEvtAndroidInterpreter>>printOop: (in category 'debug printing') ----- + printOop: oop + | cls fmt lastIndex startIP bytecodesPerLine | + <inline: false> + self printHex: oop. + (objectMemory isIntegerObject: oop) ifTrue: + [^self + cCode: 'jprintf("=%ld\n", integerValueOf(oop))' + inSmalltalk: [self print: (self shortPrint: oop); cr]]. + (oop between: objectMemory startOfMemory and: objectMemory freeStart) ifFalse: + [self printHex: oop; print: ' is not on the heap'; cr. + ^nil]. + (oop bitAnd: (BytesPerWord - 1)) ~= 0 ifTrue: + [self printHex: oop; print: ' is misaligned'; cr. + ^nil]. + (objectMemory isFreeObject: oop) ifTrue: + [self print: ' free chunk of size '; printNum: (objectMemory sizeOfFree: oop); cr. + ^nil]. + self print: ': a(n) '. + self printNameOfClass: (cls := objectMemory fetchClassOfNonInt: oop) count: 5. + cls = (objectMemory splObj: ClassFloat) ifTrue: + [self cr; printFloat: (self dbgFloatValueOf: oop); cr. + ^nil]. + fmt := objectMemory formatOf: oop. + fmt > 4 ifTrue: + [self print: ' nbytes '; printNum: (objectMemory byteSizeOf: oop)]. + self cr. + (fmt > 4 and: [fmt < 12]) ifTrue: + ["This will answer false if splObj: ClassAlien is nilObject" + (self is: oop KindOfClass: (objectMemory splObj: ClassAlien)) ifTrue: + [self print: ' datasize '; printNum: (self sizeOfAlienData: oop). + self print: ((self isIndirectAlien: oop) + ifTrue: [' indirect @ '] + ifFalse: + [(self isPointerAlien: oop) + ifTrue: [' pointer @ '] + ifFalse: [' direct @ ']]). + self printHex: (self startOfAlienData: oop); cr. + ^nil]. + (objectMemory isWords: oop) ifTrue: + [lastIndex := 64 min: ((objectMemory byteSizeOf: oop) / BytesPerWord). + lastIndex > 0 ifTrue: + [1 to: lastIndex do: + [:index| + self space; printHex: (objectMemory fetchLong32: index - 1 ofObject: oop). + (index \\ self elementsPerPrintOopLine) = 0 ifTrue: + [self cr]]. + (lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse: + [self cr]]. + ^nil]. + ^self printStringOf: oop; cr]. + lastIndex := 64 min: (startIP := (objectMemory lastPointerOf: oop) / BytesPerWord). + lastIndex > 0 ifTrue: + [1 to: lastIndex do: + [:index| + self cCode: 'printHex(fetchPointerofObject(index - 1, oop)); putchar('' '')' + inSmalltalk: [self space; printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space. + self print: (self shortPrint: (objectMemory fetchPointer: index - 1 ofObject: oop))]. + (index \\ self elementsPerPrintOopLine) = 0 ifTrue: + [self cr]]. + (lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse: + [self cr]]. + (objectMemory isCompiledMethod: oop) + ifFalse: + [startIP > 64 ifTrue: [self print: '...'; cr]] + ifTrue: + [startIP := startIP * BytesPerWord + 1. + lastIndex := objectMemory lengthOf: oop. + lastIndex - startIP > 100 ifTrue: + [lastIndex := startIP + 100]. + bytecodesPerLine := 10. + startIP to: lastIndex do: + [:index| | byte | + byte := objectMemory fetchByte: index - 1 ofObject: oop. + self cCode: 'jprintf(" %02x/%-3d", byte,byte)' + inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. + ((index - startIP + 1) \\ bytecodesPerLine) = 0 ifTrue: + [self cr]]. + ((lastIndex - startIP + 1) \\ bytecodesPerLine) = 0 ifFalse: + [self cr]]! Item was added: + ----- Method: StackEvtAndroidInterpreter>>printOopShortInner: (in category 'debug printing') ----- + printOopShortInner: oop + | classOop name nameLen | + <var: #name type: #'char *'> + <inline: true> + self printChar: $=. + (objectMemory isIntegerObject: oop) ifTrue: + [self printNum: (objectMemory integerValueOf: oop); + printChar: $(; + printHex: (objectMemory integerValueOf: oop); + printChar: $). + ^nil]. + (oop between: objectMemory startOfMemory and: objectMemory freeStart) ifFalse: + [self printHex: oop; print: ' is not on the heap'. + ^nil]. + (oop bitAnd: (BytesPerWord - 1)) ~= 0 ifTrue: + [self printHex: oop; print: ' is misaligned'. + ^nil]. + (self isFloatObject: oop) ifTrue: + [self printFloat: (self dbgFloatValueOf: oop). + ^nil]. + classOop := objectMemory fetchClassOfNonInt: oop. + (objectMemory addressCouldBeObj: classOop) ifFalse: + [self print: 'a ??'. ^nil]. + (objectMemory sizeBitsOf: classOop) = metaclassSizeBytes ifTrue: + [self printNameOfClass: oop count: 5. + ^nil]. + oop = objectMemory nilObject ifTrue: [self print: 'nil'. ^nil]. + oop = objectMemory trueObject ifTrue: [self print: 'true'. ^nil]. + oop = objectMemory falseObject ifTrue: [self print: 'false'. ^nil]. + nameLen := self lengthOfNameOfClass: classOop. + nameLen = 0 ifTrue: [self print: 'a ??'. ^nil]. + name := self nameOfClass: classOop. + nameLen = 10 ifTrue: + [(self str: name n: 'ByteString' cmp: 10) not "strncmp is weird" ifTrue: + [self printChar: $"; printStringOf: oop; printChar: $". + ^nil]. + (self str: name n: 'ByteSymbol' cmp: 10) not "strncmp is weird" ifTrue: + [self printChar: $#; printStringOf: oop. + ^nil]]. + (nameLen = 9 and: [(self str: name n: 'Character' cmp: 9) not]) ifTrue: + [self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop)). + ^nil]. + self cCode: [self dpri: 9 n: 'a(n) %.*s' t: nameLen f: name] + inSmalltalk: [self print: 'a(n) '; print: name]! Item was added: + ----- Method: StackEvtAndroidInterpreter>>shortPrintOop: (in category 'debug printing') ----- + shortPrintOop: oop + <inline: false> + self printNum: oop. + (objectMemory isIntegerObject: oop) ifTrue: + [^self cCode: 'jprintf("=%ld\n", integerValueOf(oop))' inSmalltalk: [self print: (self shortPrint: oop); cr]]. + (oop between: objectMemory startOfMemory and: objectMemory freeStart) ifFalse: + [self printHex: oop; print: ' is not on the heap'; cr. + ^nil]. + (oop bitAnd: (BytesPerWord - 1)) ~= 0 ifTrue: + [self printHex: oop; print: ' is misaligned'; cr. + ^nil]. + self print: ': a(n) '. + self printNameOfClass: (objectMemory fetchClassOf: oop) count: 5. + self cr! Item was added: + StackInterpreterPrimitives subclass: #StackEvtInterpreter + instanceVariableNames: 'jmpBufExit' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Interpreter'! + + !StackEvtInterpreter commentStamp: 'golubovsky 7/9/2011 21:24' prior: 0! + This is a subclass of the StackInterpreter which implements the specifics of the Event-driven Cog Stack VM! Item was added: + ----- Method: StackEvtInterpreter class>>declareCVarsIn: (in category 'translation') ----- + declareCVarsIn: aCCodeGenerator + "define the jmpbuf for bailing out of the interpreter: its definition will be added + to the definitions made by the parent classes - no super call is necessary" + aCCodeGenerator var: #jmpBufExit declareC: 'jmp_buf jmpBufExit'. + + ! Item was added: + ----- Method: StackEvtInterpreter>>callbackEnter: (in category 'callback support') ----- + callbackEnter: callbackID + "Callbacks are disabled in Event VM" + <export: true> + <var: #callbackID type: #'sqInt *'> + [^false].! Item was added: + ----- Method: StackEvtInterpreter>>initStackPagesAndInterpret (in category 'initialization') ----- + initStackPagesAndInterpret + "Initialize the stack pages and enter interpret. Use alloca'ed memory so that when + we have a JIT its stack pointer will be on the native stack since alloca allocates + memory on the stack. Certain thread systems use the native stack pointer as the + frame ID so putting the stack anywhere else can confuse the thread system." + + "This method overrides its parent so that heartbeat is not initialized: EventVM does not + have hartbeat." + + "This method overrides its parent so that stack pages are malloc-ed rather than + alloca-ed so they are retained intact when interpreter exits to wait for an event." + + "This should be in its own initStackPages method but Slang can't inline + C code strings." + | stackPageBytes stackPagesBytes theStackMemory | + <var: #theStackMemory type: #'void *'> + stackPageBytes := self stackPageByteSize. + stackPagesBytes := self computeStackZoneSize. + theStackMemory := self + cCode: 'malloc(stackPagesBytes)' + inSmalltalk: + [stackPages := self stackPagesClass new. + stackPages initializeWithByteSize: stackPagesBytes for: self]. + stackPages + initializeStack: theStackMemory + numSlots: stackPagesBytes / BytesPerWord + pageSize: stackPageBytes / BytesPerWord + stackLimitOffset: self stackLimitOffset + stackPageHeadroom: self stackPageHeadroom. + + "Once the stack pages are initialized we can continue to bootstrap the system." + self loadInitialContext. + self interpret. + ^nil! Item was added: + ----- Method: StackEvtInterpreter>>interpret (in category 'interpreter shell') ----- + interpret + "This is the main interpreter loop. It normally loops forever, fetching and executing bytecodes. When running in the context of a browser plugin VM, however, it must return control to the browser periodically. This should done only when the state of the currently running Squeak thread is safely stored in the object heap. Since this is the case at the moment that a check for interrupts is performed, that is when we return to the browser if it is time to do so. Interrupt checks happen quite frequently. The EventVM version of interpreter also has a special jmp_buf used to bail out of the interpreter once no processes are ready to run. If returned for no events available, return value is 0, and if returned as normal VM termination, return value is 1. The host program may use this information to determine when to loop" + + | result | + <inline: false> + "If stacklimit is zero then the stack pages have not been initialized." + stackLimit = 0 ifTrue: + [^self initStackPagesAndInterpret]. + "record entry time when running as a browser plug-in" + self browserPluginInitialiseIfNeeded. + "set up a jmp_buf to bail out when no processes are ready to run" + result := self cCode: 'setjmp(jmpBufExit)' + inSmalltalk:[jmpBufExit := [^self]. 0]. + result = 0 ifFalse:[^0]. "return 0 when suspended for an event" + self internalizeIPandSP. + self fetchNextBytecode. + [true] whileTrue: [self dispatchOn: currentBytecode in: BytecodeTable]. + localIP := localIP - 1. "undo the pre-increment of IP before returning" + self externalizeIPandSP. + ^1 "return 1 if normal VM termination" + ! Item was added: + ----- Method: StackEvtInterpreter>>primitiveRelinquishProcessor (in category 'process primitive support') ----- + primitiveRelinquishProcessor + "This is a special version of the primitive used in an event-driven VM. It does not call host's + ioRelinquishProcessor at all; instead it long jumps to the interpreter's jump target and + exits to the host program. The interpreter will be reentered on the next event either + user-induced or by timer" + + | microSecs | + microSecs := self stackIntegerValue: 0. + "DO NOT allow relinquishing the processor while we are profiling since this + may skew the time base for our measures (it may reduce processor speed etc). + Instead we go full speed, therefore measuring the precise time we spend in the + inner idle loop as a busy loop." + nextProfileTick = 0 ifTrue:[ + self pop: 1. "microSecs; leave rcvr on stack" + self cCode:'longjmp(jmpBufExit, 1)' + inSmalltalk:[jmpBufExit value]. + ]. + self pop: 1. "microSecs; leave rcvr on stack" + !

1 0

Re: [Box-Admins] Request to register a project
by David T. Lewis 01 Jan '12

01 Jan '12

On Sat, Dec 31, 2011 at 01:01:29PM +0100, Bert Freudenberg wrote: > On 31.12.2011, at 06:29, Dimitry Golubovsky wrote: > > > Hi, > > > > I work on the Android port of COG VM and some related Pharo packages. > > I am currently hosting them on Squeaksource > > (http://www.squeaksource.com/EventVM) but Squeaksource is too slow > > when accessed from the US. > > It's slow from everywhere. Migrating it to a faster machine is planned but not yet done. > > > I would like to move the hosting of these projects to > > source.squeak.org as it is much faster from my location. > > > > Unfortunately the server at source.squeak.com does not allow me to > > create a project. > > Yes, because we currently use that server only for more or less "official" projects. Your Android port would certainly qualify. > > > I registered at source.squeak.com (initials "dmg"). > > > > Please help creating the project. > > > > Thank you. > > > Perhaps instead of adding a new repository it would make sense to use the existing VMMaker repository? > > http://source.squeak.org/VMMaker.html > > I'm cc'ing Dave so he may add you. > > - Bert - > Hi Dimitry, I added you as developer on the VMMaker repository at http://source.squeak.org/ Thanks! Dave

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2012