Vm-dev February 2012

vm-dev@lists.squeakfoundation.org

21 participants
54 discussions

a problem merging latest changes
by Esteban Lorenzano 20 Feb '12

20 Feb '12

Hi Eliot, list I'm merging latest changes with my work and I have a problem with some of your changes: StackInterpreter>>#declareCVarsIn: now ads this code: aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS). MULTIPLEBYTECODESETS ifFalse: [aCCodeGenerator var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0']. and MULTIPLEBYTECODESETS is initialized to false now, problem is that aCCodeGenerator var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' will generate #define bytecodeSetSelector 0; and semicolon with generate a compiler error... so... there is a problem there. How can I change that so it works? btw, if I initialize MULTIPLEBYTECODESETS as true problem gone, but I don't know if that change is appropiate (and also, we need a fix for bad generated code) cheers, Esteban

2 3

VM Maker: VMMaker.oscog-eem.147.mcz
by commits＠source.squeak.org 20 Feb '12

20 Feb '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.147.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.147 Author: eem Time: 20 February 2012, 9:55:07.958 am UUID: 9ebc4007-56c3-4a6d-8eec-a3de3e08a1fe Ancestors: VMMaker.oscog-eem.146 Fix code egneration for the var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack hack. Perhaps var: #bytecodeSetSelector declareC: 'const int bytecodeSetSelector = 0' is better? =============== Diff against VMMaker.oscog-eem.146 =============== Item was changed: ----- Method: CCodeGenerator>>emitCVariablesOn: (in category 'C code generator') ----- emitCVariablesOn: aStream "Store the global variable declarations on the given stream." aStream cr; nextPutAll: '/*** Variables ***/'; cr. (self sortStrings: variables) do: [:var | | varString decl | varString := var asString. decl := variableDeclarations at: varString ifAbsent: ['sqInt ' , varString]. + decl first == $# "support cgen var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack" - self isGeneratingPluginCode ifTrue: + [aStream nextPutAll: decl; cr] - [varString = 'interpreterProxy' - ifTrue: ["quite special..." - aStream cr; nextPutAll: '#ifdef SQUEAK_BUILTIN_PLUGIN'. - aStream cr; nextPutAll: 'extern'. - aStream cr; nextPutAll: '#endif'; cr] - ifFalse: [(decl beginsWith: 'static') ifFalse: - [aStream nextPutAll: 'static ']]] ifFalse: + [self isGeneratingPluginCode + ifTrue: + [varString = 'interpreterProxy' + ifTrue: ["quite special..." + aStream cr; nextPutAll: '#ifdef SQUEAK_BUILTIN_PLUGIN'. + aStream cr; nextPutAll: 'extern'. + aStream cr; nextPutAll: '#endif'; cr] + ifFalse: [(decl beginsWith: 'static') ifFalse: + [aStream nextPutAll: 'static ']]] + ifFalse: + [(vmClass mustBeGlobal: varString) ifFalse: + [(decl beginsWith: 'static') ifFalse: + [aStream nextPutAll: 'static ']]]. + aStream + nextPutAll: decl; + nextPut: $;; + cr]]. - [(vmClass mustBeGlobal: varString) ifFalse: - [(decl beginsWith: 'static') ifFalse: - [aStream nextPutAll: 'static ']]]. - aStream - nextPutAll: decl; - nextPut: $;; - cr]. aStream cr! Item was changed: ----- Method: CCodeGeneratorGlobalStructure>>emitCVariablesOn: (in category 'C code generator') ----- emitCVariablesOn: aStream "Store the global variable declarations on the given stream. + Break logic into vars for structure and vars for non-structure." - break logic into vars for structure and vars for non-structure" | structure nonstruct | structure := WriteStream on: (String new: 32768). nonstruct := WriteStream on: (String new: 32768). aStream nextPutAll: '/*** Variables ***/'; cr. structure nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; nextPutAll: '# define _iss /* define in-struct static as void */'; cr; nextPutAll: 'static struct foo {'; cr; nextPutAll: '#else'; cr; nextPutAll: '# define _iss static'; cr; nextPutAll: '#endif'; cr. self buildSortedVariablesCollection do: + [ :var | | decl varString inStruct target | - [ :var | | varString inStruct target | target := (inStruct := self placeInStructure: (varString := var asString)) ifTrue: [structure] ifFalse: [nonstruct]. + decl := variableDeclarations at: varString ifAbsent: ['sqInt ' , varString]. + decl first == $# "support cgen var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack" - self isGeneratingPluginCode ifTrue: + [target nextPutAll: decl; cr] - [varString = 'interpreterProxy' - ifTrue: ["quite special..." - target cr; nextPutAll: '#ifdef SQUEAK_BUILTIN_PLUGIN'. - target cr; nextPutAll: 'extern'. - target cr; nextPutAll: '#endif'; cr] - ifFalse: [target nextPutAll: 'static ']] ifFalse: + [self isGeneratingPluginCode + ifTrue: + [varString = 'interpreterProxy' + ifTrue: ["quite special..." + target cr; nextPutAll: '#ifdef SQUEAK_BUILTIN_PLUGIN'. + target cr; nextPutAll: 'extern'. + target cr; nextPutAll: '#endif'; cr] + ifFalse: [target nextPutAll: 'static ']] + ifFalse: + [(vmClass mustBeGlobal: varString) ifFalse: + [target nextPutAll: (inStruct ifTrue: ['_iss '] ifFalse: ['static '])]]. + target nextPutAll: decl; nextPut: $;; cr]]. - [(vmClass mustBeGlobal: varString) ifFalse: - [target nextPutAll: (inStruct ifTrue: ['_iss '] ifFalse: ['static '])]]. - target - nextPutAll: (variableDeclarations at: varString ifAbsent: ['sqInt ' , varString]); - nextPut: $;; - cr]. structure nextPutAll: '#undef _iss'; cr; nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; nextPutAll: ' } fum;'; cr; nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT register struct foo * foo = &fum;'; cr; nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT volatile register struct foo * foo = &fum;'; cr; nextPutAll: '# define GIV(interpreterInstVar) (foo->interpreterInstVar)'; cr; nextPutAll: '#else'; cr; nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT /* oh, no mr bill!! */'; cr; nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT /* oh no, mr bill!! */'; cr; nextPutAll: '# define GIV(interpreterInstVar) interpreterInstVar'; cr; nextPutAll: '#endif'; cr. "if the machine needs the fum structure defining locally, do it now" localStructDef ifTrue: [structure nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; nextPutAll: 'static struct foo * foo = &fum;'; cr; nextPutAll: '#endif'; cr]. aStream nextPutAll: structure contents; nextPutAll: nonstruct contents; cr!

1 0

Squeak VM port to Google Native Client
by Yoshiki Ohshima 20 Feb '12

20 Feb '12

Hello, I'm playing with Google Native Client a bit and made a port of Squeak VM to it. It is far from complete (even the state where backspace or Cmd-p etc. does not work, sound does not work, etc.), It now reached to the state where I can say the basic part of it is working. The source code is available at: http://github.com/yoshikiohshima/NaClSqueak . Also, f you have Google Chrome 11 beta available, try to turn on the Native Client on (by typing "about:flags" into the title bar) and access: http://tinlizzie.org/~ohshima/squeak/squeak.html (The first try may take some time.) - It is gnuify-ed but we're still learning the JIT situation of NaCl. So, it' need some work to port Cog. - The image data is embedded as a C array in this executable. You can remove EMBEDDED_IMAGE_FILE flag off, and comment/uncomment the corresponding part of squeak.html, it can load the image separately via XMLHttpRequest of the browser. - There is some strange issue when you do fast drag the system window. - As you can see, the source code is derived from the Unix VM. It was hard for me to write some CMake stuff to set it up for the cross compilation. A help to merge it back to the Unix code would be greatly appreciated. - If Google takes over the world and all apps become a Native Client (may be even other browsers^^;), this port may be useful^^; -- Yoshiki

9 25

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.146.mcz
by David T. Lewis 19 Feb '12

19 Feb '12

On Sun, Feb 19, 2012 at 07:43:36PM +0000, commits(a)source.squeak.org wrote: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.146.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.146 > Author: eem > Time: 19 February 2012, 11:42:38.406 am > UUID: b6c14447-ad5d-4a58-8479-63e47d215c0b > Ancestors: VMMaker.oscog-eem.145 > > Support for multiple bytecode sets. The sign bit of a method's > header can select an alternative bytecode set. This is implemented > by adding 256 to currentBytecode when dispatching. The overhead > is avoioded for slow machines using macrology. But in tests on a > fast MacBook Pro adding the offset can actually be faster because > other effects dominate dispatch performance on modern machines > (e.g. code placement). This sounds interesting :)) Dave

1 0

VM Maker: VMMaker.oscog-eem.146.mcz
by commits＠source.squeak.org 19 Feb '12

19 Feb '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.146.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.146 Author: eem Time: 19 February 2012, 11:42:38.406 am UUID: b6c14447-ad5d-4a58-8479-63e47d215c0b Ancestors: VMMaker.oscog-eem.145 Support for multiple bytecode sets. The sign bit of a method's header can select an alternative bytecode set. This is implemented by adding 256 to currentBytecode when dispatching. The overhead is avoioded for slow machines using macrology. But in tests on a fast MacBook Pro adding the offset can actually be faster because other effects dominate dispatch performance on modern machines (e.g. code placement). =============== Diff against VMMaker.oscog-eem.145 =============== Item was changed: ----- Method: CCodeGenerator>>addClassVarsFor: (in category 'public') ----- addClassVarsFor: aClass "Add the class variables for the given class to the code base as constants." + aClass classPool associationsDo: + [:assoc | self addConstantForBinding: assoc]! - aClass classPool associationsDo: [:assoc | | val node | - val := assoc value. - node := (useSymbolicConstants and:[self isCLiteral: val]) - ifTrue:[TDefineNode new setName: assoc key asString value: assoc value] - ifFalse:[TConstantNode new setValue: assoc value]. - constants at: assoc key asString put: node]. - ! Item was added: + ----- Method: CCodeGenerator>>addConstantForBinding: (in category 'public') ----- + addConstantForBinding: variableBinding + "Add the pool variable to the code base as a constant." + | node val | + val := variableBinding value. + node := (useSymbolicConstants and: [self isCLiteral: val]) + ifTrue:[TDefineNode new + setName: variableBinding key asString + value: variableBinding value] + ifFalse:[TConstantNode new setValue: variableBinding value]. + constants at: variableBinding key asString put: node! Item was changed: ----- Method: CCodeGenerator>>emitCConstantsOn: (in category 'C code generator') ----- emitCConstantsOn: aStream "Store the global variable declarations on the given stream." | unused constList | unused := constants keys asSet. methods do: [:meth| meth parseTree nodesDo: [:n| n isConstant ifTrue: [unused remove: n name ifAbsent: []]]]. unused copy do: [:const| (variableDeclarations anySatisfy: [:value| value includesSubString: const]) ifTrue: [unused remove: const ifAbsent: []]]. "Don't generate any defines for the externally defined constants, STACKVM, COGVM, COGMTVM et al." (VMClass class>>#initializeMiscConstantsWith:) literalsDo: [:lit| lit isVariableBinding ifTrue: [unused add: lit key]]. + "force inclusion of BytesPerWord and MULTIPLEBYTECODESETS declarations." + #(BytesPerWord MULTIPLEBYTECODESETS) do: + [:key| unused remove: key ifAbsent: []]. - unused remove: #BytesPerWord ifAbsent: []. "force inclusion of BytesPerWord declaration" constList := constants keys reject:[:any| unused includes: any]. aStream cr; nextPutAll: '/*** Constants ***/'; cr. (self sortStrings: constList) do: [:varName| | node default value | node := constants at: varName. node name isEmpty ifFalse: ["Allow the class to provide an alternative definition, either of just the value or the whole shebang" default := self cLiteralFor: node value name: varName. value := vmClass ifNotNil: [(vmClass specialValueForConstant: node name default: default) ifNotNil: [:specialDef| specialDef] ifNil: [default]] ifNil: [default]. value first ~= $# ifTrue: [aStream nextPutAll: '#define '; nextPutAll: node name; space]. aStream nextPutAll: value; cr]]. aStream cr! Item was changed: ----- Method: CoInterpreter>>setMethod: (in category 'internal interpreter access') ----- setMethod: aMethodObj self assert: aMethodObj asUnsignedInteger >= objectMemory startOfMemory. + super setMethod: aMethodObj! - method := aMethodObj! Item was changed: ----- Method: CogVMSimulator>>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 web browser plugin VM, however, it must return control to the web 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. Override for simulation to insert bytecode breakpoint support." <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. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. atEachStepBlock value. "N.B. may be nil" + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP. ^nil ! Item was changed: ----- Method: CogVMSimulator>>logOfBytesVerify:fromFileNamed:fromStart: (in category 'testing') ----- logOfBytesVerify: nBytes fromFileNamed: fileName fromStart: loggingStart "Verify a questionable interpreter against a successful run" "self logOfBytesVerify: 10000 fromFileNamed: 'clone32Bytecodes.log' " + | logFile rightWord prevCtxt | - | logFile rightByte prevCtxt | logFile := (FileStream readOnlyFileNamed: fileName) binary. transcript clear. byteCount := 0. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. prevCtxt := 0. prevCtxt := prevCtxt. [byteCount < nBytes] whileTrue: [ " byteCount > 14560 ifTrue: [self externalizeIPandSP. prevCtxt = activeContext ifFalse: [prevCtxt := activeContext. transcript cr; nextPutAll: (self printTop: 2); endEntry]. transcript cr; print: byteCount; nextPutAll: ': ' , (activeContext hex); space; print: (instructionPointer - method - (BaseHeaderSize - 2)); nextPutAll: ': <' , (self byteAt: localIP) hex , '>'; space; nextPutAll: (self symbolic: currentBytecode at: localIP inMethod: method); space; print: (self stackPointerIndex - TempFrameStart + 1); endEntry. byteCount = 14590 ifTrue: [self halt]]. " loggingStart >= byteCount ifTrue: + [rightWord := logFile nextWord. + currentBytecode + bytecodeSetSelector = rightWord ifFalse: - [rightByte := logFile next. - currentBytecode = rightByte ifFalse: [self halt: 'halt at ', byteCount printString]]. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. self externalizeIPandSP. logFile close. self inform: nBytes printString , ' bytecodes verfied.'! Item was changed: ----- Method: CogVMSimulator>>logOfBytesWrite:toFileNamed:fromStart: (in category 'testing') ----- logOfBytesWrite: nBytes toFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfBytesWrite: 10000 toFileNamed: 'clone32Bytecodes.log' " | logFile | logFile := (FileStream newFileNamed: fileName) binary. transcript clear. byteCount := 0. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [byteCount < nBytes] whileTrue: [byteCount >= loggingStart ifTrue: + [logFile nextWordPut: currentBytecode + bytecodeSetSelector]. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - [logFile nextPut: currentBytecode]. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. self externalizeIPandSP. logFile close! Item was changed: ----- Method: CogVMSimulator>>logOfSendsVerify:fromFileNamed:fromStart: (in category 'testing') ----- logOfSendsVerify: nSends fromFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfSendsWrite: 10000 toFileNamed: 'clone32Messages.log' " | logFile priorFrame rightSelector prevCtxt | logFile := FileStream readOnlyFileNamed: fileName. transcript clear. byteCount := 0. sendCount := 0. priorFrame := localFP. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. prevCtxt := 0. prevCtxt := prevCtxt. [sendCount < nSends] whileTrue: [ " byteCount>500 ifTrue: [byteCount>550 ifTrue: [self halt]. self externalizeIPandSP. prevCtxt = localFP ifFalse: [prevCtxt := localFP. transcript cr; nextPutAll: (self printTop: 2); endEntry]. transcript cr; print: byteCount; nextPutAll: ': ' , (localFP hex); space; print: (instructionPointer - method - (BaseHeaderSize - 2)); nextPutAll: ': <' , (self byteAt: localIP) hex , '>'; space; nextPutAll: (self symbolic: currentBytecode at: localIP inMethod: method); space; print: (self stackPointerIndex - TempFrameStart + 1); endEntry. ]. " + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. localFP == priorFrame ifFalse: [sendCount := sendCount + 1. loggingStart >= sendCount ifTrue: [rightSelector := logFile nextLine. (self stringOf: messageSelector) = rightSelector ifFalse: [self halt: 'halt at ', sendCount printString]]. priorFrame := localFP]. self incrementByteCount]. self externalizeIPandSP. logFile close. self inform: nSends printString , ' sends verfied.'! Item was changed: ----- Method: CogVMSimulator>>logOfSendsWrite:toFileNamed:fromStart: (in category 'testing') ----- logOfSendsWrite: nSends toFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfSendsWrite: 10000 toFileNamed: 'clone32Messages.log' fromStart: 2500" | logFile priorFrame | logFile := FileStream newFileNamed: fileName. transcript clear. byteCount := 0. sendCount := 0. priorFrame := localFP. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [sendCount < nSends] whileTrue: + [self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - [self dispatchOn: currentBytecode in: BytecodeTable. localFP == priorFrame ifFalse: [sendCount >= loggingStart ifTrue: [sendCount := sendCount + 1. logFile nextPutAll: (self stringOf: messageSelector); cr]. priorFrame := localFP]. self incrementByteCount]. self externalizeIPandSP. logFile close! Item was changed: ----- Method: CogVMSimulator>>printCurrentBytecodeOn: (in category 'debug printing') ----- printCurrentBytecodeOn: aStream | code | code := currentBytecode radix: 16. + aStream ensureCr; print: localIP - method - 3; tab. + bytecodeSetSelector > 0 ifTrue: + [aStream nextPutAll: 'ALT ']. aStream - ensureCr; - print: localIP - method - 3; - tab; nextPut: (code size < 2 ifTrue: [$0] ifFalse: [code at: 1]); nextPut: code last; space; + nextPutAll: (BytecodeTable at: currentBytecode + bytecodeSetSelector + 1); - nextPutAll: (BytecodeTable at: currentBytecode + 1); space; nextPut: $(; print: byteCount + 1; nextPut: $)! Item was changed: ----- Method: Cogit>>cog:selector: (in category 'jit - api') ----- cog: aMethodObj selector: aSelectorOop "Attempt to produce a machine code method for the bytecode method object aMethodObj. N.B. If there is no code memory available do *NOT* attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) depend on the zone remaining constant across method generation." <api> <returnTypeC: #'CogMethod *'> | cogMethod | <var: #cogMethod type: #'CogMethod *'> self assert: ((coInterpreter methodHasCogMethod: aMethodObj) not or: [(self noAssertMethodClassAssociationOf: aMethodObj) = objectMemory nilObject]). "coInterpreter stringOf: aSelectorOop" coInterpreter compilationBreak: aSelectorOop point: (objectMemory lengthOf: aSelectorOop). aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. self cppIf: NewspeakVM ifTrue: [cogMethod := methodZone findPreviouslyCompiledVersionOf: aMethodObj with: aSelectorOop. cogMethod ifNotNil: [(coInterpreter methodHasCogMethod: aMethodObj) not ifTrue: [self assert: (coInterpreter rawHeaderOf: aMethodObj) = cogMethod methodHeader. cogMethod methodObject: aMethodObj. coInterpreter rawHeaderOf: aMethodObj put: cogMethod asInteger]. ^cogMethod]]. + "The alternate bytecode set is for now always interpreted." + (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifTrue: + [^nil]. methodObj := aMethodObj. cogMethod := self compileCogMethod: aSelectorOop. (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: [cogMethod asInteger >= MaxUnreportableError ifTrue: [cogMethod asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]] ifFalse: [self reportError: (self cCoerceSimple: cogMethod to: #sqInt)]. ^nil]. "self cCode: '' inSmalltalk: [coInterpreter printCogMethod: cogMethod. ""coInterpreter symbolicMethod: aMethodObj."" self assertValidMethodMap: cogMethod." "self disassembleMethod: cogMethod." "printInstructions := clickConfirm := true""]." ^cogMethod! Item was changed: InterpreterPrimitives subclass: #StackInterpreter + instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue primitiveFunctionPointer methodCache atCache lkupClass highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassSizeBytes interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered tempOop statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents theUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite statPendingFinalizationSignals gcSemaphoreIndex classByteArrayCompactIndex' - instanceVariableNames: 'currentBytecode localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue primitiveFunctionPointer methodCache atCache lkupClass highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassSizeBytes interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered tempOop statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents theUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite statPendingFinalizationSignals gcSemaphoreIndex classByteArrayCompactIndex' classVariableNames: 'AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MixinIndex PrimitiveExternalCallIndex PrimitiveTable' poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSqueakV3BytecodeConstants VMSqueakV3ObjectRepresentationConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: '<historical>' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. NOTE: Here follows a list of things to be borne in mind when working on this code, or when making changes for the future. 1. There are a number of things that should be done the next time we plan to release a completely incompatible image format. These include unifying the instanceSize field of the class format word -- see instantiateClass:indexableSize:, and unifying the bits of the method primitive index (if we decide we need more than 512, after all) -- see primitiveIndexOf:. Also, contexts should be given a special format code (see next item). 2. There are several fast checks for contexts (see isContextHeader: and isMethodContextHeader:) which will fail if the compact class indices of BlockContext or MethodContext change. This is necessary because the oops may change during a compaction when the oops are being adjusted. It's important to be aware of this when writing a new image using the SystemTracer. A better solution would be to reserve one of the format codes for Contexts only. 3. We have made normal files tolerant to size and positions up to 32 bits. This has not been done for async files, since they are still experimental. The code in size, at: and at:put: should work with sizes and indices up to 31 bits, although I have not tested it (di 12/98); it might or might not work with 32-bit sizes. 4. Note that 0 is used in a couple of places as an impossible oop. This should be changed to a constant that really is impossible (or perhaps there is code somewhere that guarantees it --if so it should be put in this comment). The places include the method cache and the at cache. 5. Moving to a 2 bit immediate tag and having immediate Characters is a good choice for Unicode and the JIT 6. If Eliot Miranda's 2 word header scheme is acceptable in terms of footprint (we estimate about a 10% increase in image size with about 35 reclaimed by better representation of CompiledMethod - loss of MethodProperties) then the in-line cache for the JIT is simplified, class access is faster and header access is the same in 32-bit and full 64-bit images.! Item was changed: ----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" aCCodeGenerator addHeaderFile:'<stddef.h> /* for e.g. alloca */'; addHeaderFile:'<setjmp.h>'; addHeaderFile:'"vmCallback.h"'; addHeaderFile:'"sqMemoryFence.h"'; addHeaderFile:'"dispdbg.h"'. self declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'. aCCodeGenerator var: #interpreterProxy type: #'struct VirtualMachine*'. aCCodeGenerator declareVar: #sendTrace type: 'volatile int'; declareVar: #byteCount type: 'unsigned long'. "These need to be pointers or unsigned." self declareC: #(instructionPointer method newMethod) as: #usqInt in: aCCodeGenerator. "These are all pointers; char * because Slang has no support for C pointer arithmetic." self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory) as: #'char *' in: aCCodeGenerator. self declareC: #(stackPage overflowedPage) as: #'StackPage *' in: aCCodeGenerator. aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." + "This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS + is not defined, for the benefit of the interpreter on slow machines." + aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS). + MULTIPLEBYTECODESETS ifFalse: + [aCCodeGenerator + var: #bytecodeSetSelector + declareC: '#define bytecodeSetSelector 0']. aCCodeGenerator var: #methodCache declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. aCCodeGenerator var: #atCache declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'. aCCodeGenerator var: #primitiveTable declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex +2) printString, ' */])(void) = ', self primitiveTableString. self primitiveTable do: [:symbolOrNot| (symbolOrNot isSymbol and: [symbolOrNot ~~ #primitiveFail]) ifTrue: [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: [:tMethod| tMethod returnType: #void]]]. aCCodeGenerator var: #primitiveFunctionPointer declareC: 'void (*primitiveFunctionPointer)()'. aCCodeGenerator var: #externalPrimitiveTable declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'. aCCodeGenerator var: #showSurfaceFn type: #'void *'. aCCodeGenerator var: #jmpBuf declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedCallbacks declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedMethods declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #interruptCheckChain declareC: 'void (*interruptCheckChain)(void) = 0'. aCCodeGenerator var: #breakSelector type: #'char *'; var: #breakSelectorLength declareC: 'sqInt breakSelectorLength = -1'. self declareC: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs) as: #usqLong in: aCCodeGenerator. aCCodeGenerator var: #nextProfileTick type: #sqLong! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTable (in category 'initialization') ----- initializeBytecodeTable + "StackInterpreter initializeBytecodeTable" - "Interpreter initializeBytecodeTable" - "Note: This table will be used to generate a C switch statement." + NewspeakVM ifTrue: + [^self initializeBytecodeTableForNewspeakV3PlusClosures]. - BytecodeTable := Array new: 256. - self table: BytecodeTable from: - { - #( 0 15 pushReceiverVariableBytecode). - #( 16 31 pushTemporaryVariableBytecode). - #( 32 63 pushLiteralConstantBytecode). - #( 64 95 pushLiteralVariableBytecode). - #( 96 103 storeAndPopReceiverVariableBytecode). - #(104 111 storeAndPopTemporaryVariableBytecode). - #(112 pushReceiverBytecode). - #(113 pushConstantTrueBytecode). - #(114 pushConstantFalseBytecode). - #(115 pushConstantNilBytecode). - #(116 pushConstantMinusOneBytecode). - #(117 pushConstantZeroBytecode). - #(118 pushConstantOneBytecode). - #(119 pushConstantTwoBytecode). - #(120 returnReceiver). - #(121 returnTrue). - #(122 returnFalse). - #(123 returnNil). - #(124 returnTopFromMethod). - #(125 returnTopFromBlock). + ^self initializeBytecodeTableForSqueakV3PlusClosures! - "Newspeak bytecodes" - { 126. NewspeakVM ifTrue: [#dynamicSuperSendBytecode] ifFalse: [#unknownBytecode]}. - { 127. NewspeakVM ifTrue: [#pushImplicitReceiverBytecode] ifFalse: [#unknownBytecode]}. - - #(128 extendedPushBytecode). - #(129 extendedStoreBytecode). - #(130 extendedStoreAndPopBytecode). - #(131 singleExtendedSendBytecode). - #(132 doubleExtendedDoAnythingBytecode). - #(133 singleExtendedSuperBytecode). - #(134 secondExtendedSendBytecode). - #(135 popStackBytecode). - #(136 duplicateTopBytecode). - - #(137 pushActiveContextBytecode). - "Closure & Newspeak bytecodes" - #(138 pushNewArrayBytecode). - {139. NewspeakVM ifTrue: [#pushExplicitOuterSendReceiverBytecode] ifFalse: [#unknownBytecode]}. - #(140 pushRemoteTempLongBytecode). - #(141 storeRemoteTempLongBytecode). - #(142 storeAndPopRemoteTempLongBytecode). - #(143 pushClosureCopyCopiedValuesBytecode). - - #(144 151 shortUnconditionalJump). - #(152 159 shortConditionalJump). - #(160 167 longUnconditionalJump). - #(168 171 longJumpIfTrue). - #(172 175 longJumpIfFalse). - - "176-191 were sendArithmeticSelectorBytecode" - #(176 bytecodePrimAdd). - #(177 bytecodePrimSubtract). - #(178 bytecodePrimLessThan). - #(179 bytecodePrimGreaterThan). - #(180 bytecodePrimLessOrEqual). - #(181 bytecodePrimGreaterOrEqual). - #(182 bytecodePrimEqual). - #(183 bytecodePrimNotEqual). - #(184 bytecodePrimMultiply). - #(185 bytecodePrimDivide). - #(186 bytecodePrimMod). - #(187 bytecodePrimMakePoint). - #(188 bytecodePrimBitShift). - #(189 bytecodePrimDiv). - #(190 bytecodePrimBitAnd). - #(191 bytecodePrimBitOr). - - "192-207 were sendCommonSelectorBytecode" - #(192 bytecodePrimAt). - #(193 bytecodePrimAtPut). - #(194 bytecodePrimSize). - #(195 bytecodePrimNext). - #(196 bytecodePrimNextPut). - #(197 bytecodePrimAtEnd). - #(198 bytecodePrimEquivalent). - #(199 bytecodePrimClass). - #(200 bytecodePrimBlockCopy). - #(201 bytecodePrimValue). - #(202 bytecodePrimValueWithArg). - #(203 bytecodePrimDo). - #(204 bytecodePrimNew). - #(205 bytecodePrimNewWithArg). - #(206 bytecodePrimPointX). - #(207 bytecodePrimPointY). - - #(208 223 sendLiteralSelector0ArgsBytecode). - #(224 239 sendLiteralSelector1ArgBytecode). - #(240 255 sendLiteralSelector2ArgsBytecode). - }! Item was added: + ----- Method: StackInterpreter class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'initialization') ----- + initializeBytecodeTableForNewspeakV3PlusClosures + "StackInterpreter initializeBytecodeTableForNewspeakV3PlusClosures" + "Note: This table will be used to generate a C switch statement." + + BytecodeTable := Array new: 256. + self table: BytecodeTable from: + #( + ( 0 15 pushReceiverVariableBytecode) + ( 16 31 pushTemporaryVariableBytecode) + ( 32 63 pushLiteralConstantBytecode) + ( 64 95 pushLiteralVariableBytecode) + ( 96 103 storeAndPopReceiverVariableBytecode) + (104 111 storeAndPopTemporaryVariableBytecode) + (112 pushReceiverBytecode) + (113 pushConstantTrueBytecode) + (114 pushConstantFalseBytecode) + (115 pushConstantNilBytecode) + (116 pushConstantMinusOneBytecode) + (117 pushConstantZeroBytecode) + (118 pushConstantOneBytecode) + (119 pushConstantTwoBytecode) + (120 returnReceiver) + (121 returnTrue) + (122 returnFalse) + (123 returnNil) + (124 returnTopFromMethod) + (125 returnTopFromBlock) + + "2 of the 3 Newspeak bytecodes" + (126 dynamicSuperSendBytecode) + (127 pushImplicitReceiverBytecode) + + (128 extendedPushBytecode) + (129 extendedStoreBytecode) + (130 extendedStoreAndPopBytecode) + (131 singleExtendedSendBytecode) + (132 doubleExtendedDoAnythingBytecode) + (133 singleExtendedSuperBytecode) + (134 secondExtendedSendBytecode) + (135 popStackBytecode) + (136 duplicateTopBytecode) + + (137 pushActiveContextBytecode) + (138 pushNewArrayBytecode) + + "The last of 3 Newspeak bytecodes" + (139 pushExplicitOuterSendReceiverBytecode) + + (140 pushRemoteTempLongBytecode) + (141 storeRemoteTempLongBytecode) + (142 storeAndPopRemoteTempLongBytecode) + (143 pushClosureCopyCopiedValuesBytecode) + + (144 151 shortUnconditionalJump) + (152 159 shortConditionalJump) + (160 167 longUnconditionalJump) + (168 171 longJumpIfTrue) + (172 175 longJumpIfFalse) + + "176-191 were sendArithmeticSelectorBytecode" + (176 bytecodePrimAdd) + (177 bytecodePrimSubtract) + (178 bytecodePrimLessThan) + (179 bytecodePrimGreaterThan) + (180 bytecodePrimLessOrEqual) + (181 bytecodePrimGreaterOrEqual) + (182 bytecodePrimEqual) + (183 bytecodePrimNotEqual) + (184 bytecodePrimMultiply) + (185 bytecodePrimDivide) + (186 bytecodePrimMod) + (187 bytecodePrimMakePoint) + (188 bytecodePrimBitShift) + (189 bytecodePrimDiv) + (190 bytecodePrimBitAnd) + (191 bytecodePrimBitOr) + + "192-207 were sendCommonSelectorBytecode" + (192 bytecodePrimAt) + (193 bytecodePrimAtPut) + (194 bytecodePrimSize) + (195 bytecodePrimNext) + (196 bytecodePrimNextPut) + (197 bytecodePrimAtEnd) + (198 bytecodePrimEquivalent) + (199 bytecodePrimClass) + (200 bytecodePrimBlockCopy) + (201 bytecodePrimValue) + (202 bytecodePrimValueWithArg) + (203 bytecodePrimDo) + (204 bytecodePrimNew) + (205 bytecodePrimNewWithArg) + (206 bytecodePrimPointX) + (207 bytecodePrimPointY) + + (208 223 sendLiteralSelector0ArgsBytecode) + (224 239 sendLiteralSelector1ArgBytecode) + (240 255 sendLiteralSelector2ArgsBytecode) + )! Item was added: + ----- Method: StackInterpreter class>>initializeBytecodeTableForSqueakV3PlusClosures (in category 'initialization') ----- + initializeBytecodeTableForSqueakV3PlusClosures + "StackInterpreter initializeBytecodeTableForSqueakV3PlusClosures" + "Note: This table will be used to generate a C switch statement." + + BytecodeTable := Array new: 256. + self table: BytecodeTable from: + #( + ( 0 15 pushReceiverVariableBytecode) + ( 16 31 pushTemporaryVariableBytecode) + ( 32 63 pushLiteralConstantBytecode) + ( 64 95 pushLiteralVariableBytecode) + ( 96 103 storeAndPopReceiverVariableBytecode) + (104 111 storeAndPopTemporaryVariableBytecode) + (112 pushReceiverBytecode) + (113 pushConstantTrueBytecode) + (114 pushConstantFalseBytecode) + (115 pushConstantNilBytecode) + (116 pushConstantMinusOneBytecode) + (117 pushConstantZeroBytecode) + (118 pushConstantOneBytecode) + (119 pushConstantTwoBytecode) + (120 returnReceiver) + (121 returnTrue) + (122 returnFalse) + (123 returnNil) + (124 returnTopFromMethod) + (125 returnTopFromBlock) + + (126 127 unknownBytecode) + + (128 extendedPushBytecode) + (129 extendedStoreBytecode) + (130 extendedStoreAndPopBytecode) + (131 singleExtendedSendBytecode) + (132 doubleExtendedDoAnythingBytecode) + (133 singleExtendedSuperBytecode) + (134 secondExtendedSendBytecode) + (135 popStackBytecode) + (136 duplicateTopBytecode) + + (137 pushActiveContextBytecode) + (138 pushNewArrayBytecode) + (139 unknownBytecode) + (140 pushRemoteTempLongBytecode) + (141 storeRemoteTempLongBytecode) + (142 storeAndPopRemoteTempLongBytecode) + (143 pushClosureCopyCopiedValuesBytecode) + + (144 151 shortUnconditionalJump) + (152 159 shortConditionalJump) + (160 167 longUnconditionalJump) + (168 171 longJumpIfTrue) + (172 175 longJumpIfFalse) + + "176-191 were sendArithmeticSelectorBytecode" + (176 bytecodePrimAdd) + (177 bytecodePrimSubtract) + (178 bytecodePrimLessThan) + (179 bytecodePrimGreaterThan) + (180 bytecodePrimLessOrEqual) + (181 bytecodePrimGreaterOrEqual) + (182 bytecodePrimEqual) + (183 bytecodePrimNotEqual) + (184 bytecodePrimMultiply) + (185 bytecodePrimDivide) + (186 bytecodePrimMod) + (187 bytecodePrimMakePoint) + (188 bytecodePrimBitShift) + (189 bytecodePrimDiv) + (190 bytecodePrimBitAnd) + (191 bytecodePrimBitOr) + + "192-207 were sendCommonSelectorBytecode" + (192 bytecodePrimAt) + (193 bytecodePrimAtPut) + (194 bytecodePrimSize) + (195 bytecodePrimNext) + (196 bytecodePrimNextPut) + (197 bytecodePrimAtEnd) + (198 bytecodePrimEquivalent) + (199 bytecodePrimClass) + (200 bytecodePrimBlockCopy) + (201 bytecodePrimValue) + (202 bytecodePrimValueWithArg) + (203 bytecodePrimDo) + (204 bytecodePrimNew) + (205 bytecodePrimNewWithArg) + (206 bytecodePrimPointX) + (207 bytecodePrimPointY) + + (208 223 sendLiteralSelector0ArgsBytecode) + (224 239 sendLiteralSelector1ArgBytecode) + (240 255 sendLiteralSelector2ArgsBytecode) + )! Item was added: + ----- Method: StackInterpreter class>>initializeSqueakV3PlusClosuresBytecodeTable (in category 'initialization') ----- + initializeSqueakV3PlusClosuresBytecodeTable + "StackInterpreter initializeSqueakV3PlusClosuresBytecodeTable" + "Note: This table will be used to generate a C switch statement." + + BytecodeTable := Array new: 256. + self table: BytecodeTable from: + #( + ( 0 15 pushReceiverVariableBytecode) + ( 16 31 pushTemporaryVariableBytecode) + ( 32 63 pushLiteralConstantBytecode) + ( 64 95 pushLiteralVariableBytecode) + ( 96 103 storeAndPopReceiverVariableBytecode) + (104 111 storeAndPopTemporaryVariableBytecode) + (112 pushReceiverBytecode) + (113 pushConstantTrueBytecode) + (114 pushConstantFalseBytecode) + (115 pushConstantNilBytecode) + (116 pushConstantMinusOneBytecode) + (117 pushConstantZeroBytecode) + (118 pushConstantOneBytecode) + (119 pushConstantTwoBytecode) + (120 returnReceiver) + (121 returnTrue) + (122 returnFalse) + (123 returnNil) + (124 returnTopFromMethod) + (125 returnTopFromBlock) + + (126 127 unknownBytecode) + + (128 extendedPushBytecode) + (129 extendedStoreBytecode) + (130 extendedStoreAndPopBytecode) + (131 singleExtendedSendBytecode) + (132 doubleExtendedDoAnythingBytecode) + (133 singleExtendedSuperBytecode) + (134 secondExtendedSendBytecode) + (135 popStackBytecode) + (136 duplicateTopBytecode) + + (137 pushActiveContextBytecode) + (138 pushNewArrayBytecode) + (139 unknownBytecode) + (140 pushRemoteTempLongBytecode) + (141 storeRemoteTempLongBytecode) + (142 storeAndPopRemoteTempLongBytecode) + (143 pushClosureCopyCopiedValuesBytecode) + + (144 151 shortUnconditionalJump) + (152 159 shortConditionalJump) + (160 167 longUnconditionalJump) + (168 171 longJumpIfTrue) + (172 175 longJumpIfFalse) + + "176-191 were sendArithmeticSelectorBytecode" + (176 bytecodePrimAdd) + (177 bytecodePrimSubtract) + (178 bytecodePrimLessThan) + (179 bytecodePrimGreaterThan) + (180 bytecodePrimLessOrEqual) + (181 bytecodePrimGreaterOrEqual) + (182 bytecodePrimEqual) + (183 bytecodePrimNotEqual) + (184 bytecodePrimMultiply) + (185 bytecodePrimDivide) + (186 bytecodePrimMod) + (187 bytecodePrimMakePoint) + (188 bytecodePrimBitShift) + (189 bytecodePrimDiv) + (190 bytecodePrimBitAnd) + (191 bytecodePrimBitOr) + + "192-207 were sendCommonSelectorBytecode" + (192 bytecodePrimAt) + (193 bytecodePrimAtPut) + (194 bytecodePrimSize) + (195 bytecodePrimNext) + (196 bytecodePrimNextPut) + (197 bytecodePrimAtEnd) + (198 bytecodePrimEquivalent) + (199 bytecodePrimClass) + (200 bytecodePrimBlockCopy) + (201 bytecodePrimValue) + (202 bytecodePrimValueWithArg) + (203 bytecodePrimDo) + (204 bytecodePrimNew) + (205 bytecodePrimNewWithArg) + (206 bytecodePrimPointX) + (207 bytecodePrimPointY) + + (208 223 sendLiteralSelector0ArgsBytecode) + (224 239 sendLiteralSelector1ArgBytecode) + (240 255 sendLiteralSelector2ArgsBytecode) + )! Item was changed: ----- Method: StackInterpreter class>>mustBeGlobal: (in category 'translation') ----- mustBeGlobal: var "Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code." ^(self objectMemoryClass mustBeGlobal: var) + or: [(#('interpreterProxy' 'interpreterVersion' 'inIOProcessEvents' - or: [#('interpreterProxy' 'interpreterVersion' 'inIOProcessEvents' 'deferDisplayUpdates' 'extraVMMemory' 'showSurfaceFn' 'desiredNumStackPages' 'desiredEdenBytes' 'breakSelector' 'breakSelectorLength' 'sendTrace' + 'suppressHeartbeatFlag') includes: var) + or: [ "This allows slow machines to define bytecodeSetSelector as 0 + to avoid the interpretation overhead." + MULTIPLEBYTECODESETS not and: [var = 'bytecodeSetSelector']]]! - 'suppressHeartbeatFlag') includes: var]! Item was changed: ----- Method: StackInterpreter>>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." <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. self internalizeIPandSP. self fetchNextBytecode. + [true] whileTrue: [self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable]. - [true] whileTrue: [self dispatchOn: currentBytecode in: BytecodeTable]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP. ^nil ! Item was added: + ----- Method: StackInterpreter>>methodUsesAlternateBytecodeSet: (in category 'internal interpreter access') ----- + methodUsesAlternateBytecodeSet: aMethodObj + <api> + <inline: true> + "A negative header selects the alternate bytecode set." + ^(objectMemory integerValueOf: (self headerOf: aMethodObj)) < 0! Item was changed: ----- Method: StackInterpreter>>setMethod: (in category 'internal interpreter access') ----- setMethod: aMethodObj + "Set the method and determine the bytecode set based on the method header's sign. + If MULTIPLEBYTECODESETS then a negative header selects the alternate bytecode set. + Conditionalizing the code on MULTIPLEBYTECODESETS allows the header sign bit to be + used for other experiments." + <inline: true> + method := aMethodObj. + self cppIf: MULTIPLEBYTECODESETS + ifTrue: + [bytecodeSetSelector := (self methodUsesAlternateBytecodeSet: method) + ifTrue: [256] + ifFalse: [0]]! - method := aMethodObj! Item was changed: ----- Method: StackInterpreterSimulator>>logOfBytesVerify:fromFileNamed:fromStart: (in category 'testing') ----- logOfBytesVerify: nBytes fromFileNamed: fileName fromStart: loggingStart "Verify a questionable interpreter against a successful run" "self logOfBytesVerify: 10000 fromFileNamed: 'clone32Bytecodes.log' " + | logFile rightWord prevCtxt | - | logFile rightByte prevCtxt | logFile := (FileStream readOnlyFileNamed: fileName) binary. transcript clear. byteCount := 0. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. prevCtxt := 0. prevCtxt := prevCtxt. [byteCount < nBytes] whileTrue: [ " byteCount > 14560 ifTrue: [self externalizeIPandSP. prevCtxt = activeContext ifFalse: [prevCtxt := activeContext. transcript cr; nextPutAll: (self printTop: 2); endEntry]. transcript cr; print: byteCount; nextPutAll: ': ' , (activeContext hex); space; print: (instructionPointer - method - (BaseHeaderSize - 2)); nextPutAll: ': <' , (self byteAt: localIP) hex , '>'; space; nextPutAll: (self symbolic: currentBytecode at: localIP inMethod: method); space; print: (self stackPointerIndex - TempFrameStart + 1); endEntry. byteCount = 14590 ifTrue: [self halt]]. " loggingStart >= byteCount ifTrue: + [rightWord := logFile nextWord. + currentBytecode = rightWord ifFalse: - [rightByte := logFile next. - currentBytecode = rightByte ifFalse: [self halt: 'halt at ', byteCount printString]]. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. self externalizeIPandSP. logFile close. self inform: nBytes printString , ' bytecodes verfied.'! Item was changed: ----- Method: StackInterpreterSimulator>>logOfBytesWrite:toFileNamed:fromStart: (in category 'testing') ----- logOfBytesWrite: nBytes toFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfBytesWrite: 10000 toFileNamed: 'clone32Bytecodes.log' " | logFile | logFile := (FileStream newFileNamed: fileName) binary. transcript clear. byteCount := 0. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [byteCount < nBytes] whileTrue: [byteCount >= loggingStart ifTrue: + [logFile nextWordPut: currentBytecode + bytecodeSetSelector]. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - [logFile nextPut: currentBytecode]. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. self externalizeIPandSP. logFile close! Item was changed: ----- Method: StackInterpreterSimulator>>logOfSendsVerify:fromFileNamed:fromStart: (in category 'testing') ----- logOfSendsVerify: nSends fromFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfSendsWrite: 10000 toFileNamed: 'clone32Messages.log' " | logFile priorFrame rightSelector prevCtxt | logFile := FileStream readOnlyFileNamed: fileName. transcript clear. byteCount := 0. sendCount := 0. priorFrame := localFP. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. prevCtxt := 0. prevCtxt := prevCtxt. [sendCount < nSends] whileTrue: [ " byteCount>500 ifTrue: [byteCount>550 ifTrue: [self halt]. self externalizeIPandSP. prevCtxt = localFP ifFalse: [prevCtxt := localFP. transcript cr; nextPutAll: (self printTop: 2); endEntry]. transcript cr; print: byteCount; nextPutAll: ': ' , (localFP hex); space; print: (instructionPointer - method - (BaseHeaderSize - 2)); nextPutAll: ': <' , (self byteAt: localIP) hex , '>'; space; nextPutAll: (self symbolic: currentBytecode at: localIP inMethod: method); space; print: (self stackPointerIndex - TempFrameStart + 1); endEntry. ]. " + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. localFP = priorFrame ifFalse: [sendCount := sendCount + 1. loggingStart >= sendCount ifTrue: [rightSelector := logFile nextLine. (self stringOf: messageSelector) = rightSelector ifFalse: [self halt: 'halt at ', sendCount printString]]. priorFrame := localFP]. self incrementByteCount]. self externalizeIPandSP. logFile close. self inform: nSends printString , ' sends verfied.'! Item was changed: ----- Method: StackInterpreterSimulator>>logOfSendsWrite:toFileNamed:fromStart: (in category 'testing') ----- logOfSendsWrite: nSends toFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfSendsWrite: 10000 toFileNamed: 'clone32Messages.log' " | logFile priorFrame | logFile := FileStream newFileNamed: fileName. transcript clear. byteCount := 0. sendCount := 0. priorFrame := localFP. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [sendCount < nSends] whileTrue: + [self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - [self dispatchOn: currentBytecode in: BytecodeTable. localFP = priorFrame ifFalse: [sendCount >= loggingStart ifTrue: [sendCount := sendCount + 1. logFile nextPutAll: (self stringOf: messageSelector); cr]. priorFrame := localFP]. self incrementByteCount]. self externalizeIPandSP. logFile close! Item was changed: ----- Method: StackInterpreterSimulator>>printCurrentBytecodeOn: (in category 'debug printing') ----- printCurrentBytecodeOn: aStream | code | code := currentBytecode radix: 16. + aStream ensureCr; print: localIP - method - 3; tab. + bytecodeSetSelector > 0 ifTrue: + [aStream nextPutAll: 'ALT ']. + aStream - aStream print: localIP - method - 3; - tab; nextPut: (code size < 2 ifTrue: [$0] ifFalse: [code at: 1]); nextPut: code last; space; + nextPutAll: (BytecodeTable at: currentBytecode + bytecodeSetSelector + 1); - nextPutAll: (BytecodeTable at: currentBytecode + 1); space; nextPut: $(; print: byteCount + 1; nextPut: $)! Item was changed: ----- Method: StackInterpreterSimulator>>run (in category 'testing') ----- run "Just run" quitBlock := [([transcript dependents anyOne outermostMorphThat: [:m| m isSystemWindow]] on: Error do: [:ex| nil]) ifNotNil: [:window| (UIManager default confirm: 'close?') ifTrue: [window delete]]. ^self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. atEachStepBlock value. "N.B. may be nil" + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>runAtEachStep: (in category 'testing') ----- runAtEachStep: aBlock self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. aBlock value: currentBytecode. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>runAtEachStep:breakCount: (in category 'testing') ----- runAtEachStep: aBlock breakCount: breakCount self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. aBlock value: currentBytecode. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount. byteCount = breakCount ifTrue: [self halt]]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>runForNBytes: (in category 'testing') ----- runForNBytes: nBytecodes "Do nByteCodes more bytecode dispatches. Keep byteCount up to date. This can be run repeatedly." | endCount | self initStackPages. self loadInitialContext. endCount := byteCount + nBytecodes. self internalizeIPandSP. self fetchNextBytecode. [byteCount < endCount] whileTrue: + [self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - [self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>runWithBreakCount: (in category 'testing') ----- runWithBreakCount: theBreakCount "Just run, halting when byteCount is reached" quitBlock := [(displayView notNil and: [UIManager default confirm: 'close?']) ifTrue: [(displayView outermostMorphThat: [:m| m isSystemWindow]) ifNotNil: [:topWindow| topWindow delete]]. ^self]. breakCount := theBreakCount. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>test (in category 'testing') ----- test self initStackPages. self loadInitialContext. transcript clear. byteCount := 0. breakCount := -1. quitBlock := [^self]. printSends := printReturns := true. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. printFrameAtEachStep ifTrue: [self printFrame: localFP WithSP: localSP]. printBytecodeAtEachStep ifTrue: [self printCurrentBytecodeOn: Transcript. Transcript cr; flush]. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount. byteCount = breakCount ifTrue: ["printFrameAtEachStep :=" printBytecodeAtEachStep := true. self halt: 'hit breakCount break-point']]. self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>test1 (in category 'testing') ----- test1 self initStackPages. self loadInitialContext. transcript clear. byteCount := 0. breakCount := -1. self setBreakSelector: #blockCopy:. quitBlock := [^self]. printSends := printReturns := true. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. "byteCount >= 22283 ifTrue: [(self checkIsStillMarriedContext: 22186072 currentFP: localFP) ifFalse: [self halt]]." (printBytecodeAtEachStep "and: [self isMarriedOrWidowedContext: 22189568]") ifTrue: ["| thePage | thePage := stackPages stackPageFor: (self frameOfMarriedContext: 22189568). thePage == stackPage ifTrue: [self shortPrintFrameAndCallers: localFP SP: localSP] ifFalse: [self shortPrintFrameAndCallers: thePage headFrameFP SP: thePage headFrameSP]." self printCurrentBytecodeOn: Transcript. Transcript cr; flush]. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount. byteCount = breakCount ifTrue: ["printFrameAtEachStep := true." printSends := printBytecodeAtEachStep := true. self halt: 'hit breakCount break-point']]. self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>testBreakCount:printSends:printFrames:printBytecodes: (in category 'testing') ----- testBreakCount: breakCount printSends: shouldPrintSends printFrames: shouldPrintFrames printBytecodes: shouldPrintBytecodes self initStackPages. self loadInitialContext. transcript clear. byteCount := 0. quitBlock := [^self]. printSends := true & shouldPrintSends. "true & foo allows evaluating printFoo := true in the debugger" printFrameAtEachStep := true & shouldPrintFrames. printBytecodeAtEachStep := true & shouldPrintBytecodes. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. printFrameAtEachStep ifTrue: [self printFrame: localFP WithSP: localSP]. printBytecodeAtEachStep ifTrue: [self printCurrentBytecodeOn: Transcript. Transcript cr; flush]. + self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount. byteCount = breakCount ifTrue: ["printFrameAtEachStep :=" printBytecodeAtEachStep := true. self halt: 'hit breakCount break-point']]. self externalizeIPandSP! Item was changed: SharedPool subclass: #VMBasicConstants instanceVariableNames: '' + classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFull GCModeIncr IMMUTABILITY MULTIPLEBYTECODESETS NewspeakVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectMayMove PrimErrUnsupported PrimNoErr STACKVM ShiftForWord VMBIGENDIAN' - classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFull GCModeIncr IMMUTABILITY NewspeakVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectMayMove PrimErrUnsupported PrimNoErr STACKVM ShiftForWord VMBIGENDIAN' poolDictionaries: '' category: 'VMMaker-Interpreter'! !VMBasicConstants commentStamp: '<historical>' prior: 0! I am a shared pool for basic constants upon which the VM as a whole depends. self ensureClassPool. self classPool declare: #BytesPerWord from: VMSqueakV3ObjectRepresentationConstants classPool. self classPool declare: #BaseHeaderSize from: VMSqueakV3ObjectRepresentationConstants classPool (ObjectMemory classPool keys select: [:k| k beginsWith: 'Byte']) do: [:k| self classPool declare: k from: ObjectMemory classPool]! Item was changed: ----- Method: VMClass class>>initializeMiscConstantsWith: (in category 'initialization') ----- initializeMiscConstantsWith: optionsDictionary "Falsify the `what type of VM is this?' flags that are defined in the various interp.h files, or in the case of VMBIGENDIAN the various sqConfig.h files. Subclass implementations need to include a super initializeMiscConstantsWith:." VMBIGENDIAN class. "Mention this for the benefit of CCodeGenerator>>emitCConstantsOn:" STACKVM := COGVM := COGMTVM := false. + IMMUTABILITY := NewspeakVM := false. + MULTIPLEBYTECODESETS := false! - IMMUTABILITY := NewspeakVM := false!

1 0

[commit] r2532 - CogVm source as per VMMaker.oscog-eem.144.
by David T. Lewis 19 Feb '12

19 Feb '12

Message blocked due to size, forwarding trimmed version: ----- Forwarded message from vm-dev-owner(a)lists.squeakfoundation.org ----- Date: Sat, 18 Feb 2012 14:48:21 -0800 To: vm-dev(a)lists.squeakfoundation.org From: commits(a)squeakvm.org Subject: [commit] r2532 - CogVm source as per VMMaker.oscog-eem.144. Author: eliot Date: 2012-02-18 14:48:19 -0800 (Sat, 18 Feb 2012) New Revision: 2532 Added: branches/Cog/stackbuild/ branches/Cog/stackbuild/cygwinbuild/ branches/Cog/stackbuild/cygwinbuild/Croquet.def.in branches/Cog/stackbuild/cygwinbuild/Croquet.ico branches/Cog/stackbuild/cygwinbuild/Croquet.rc branches/Cog/stackbuild/cygwinbuild/HowToBuild branches/Cog/stackbuild/cygwinbuild/Makefile branches/Cog/stackbuild/cygwinbuild/Makefile.plugin branches/Cog/stackbuild/cygwinbuild/Pharo.def.in branches/Cog/stackbuild/cygwinbuild/Pharo.ico branches/Cog/stackbuild/cygwinbuild/Pharo.rc branches/Cog/stackbuild/cygwinbuild/Squeak.def.in branches/Cog/stackbuild/cygwinbuild/Squeak.rc branches/Cog/stackbuild/cygwinbuild/mvm branches/Cog/stackbuild/cygwinbuild/plugins.ext branches/Cog/stackbuild/cygwinbuild/plugins.int branches/Cog/stackbuild/cygwinbuild/squeak.ico branches/Cog/stackbuild/macbuild/ branches/Cog/stackbuild/macbuild/CoreVM.plist branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/ branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/eliot.mode1v3 branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/eliot.pbxuser branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/johnmci.mode1 branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/johnmci.pbxuser branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/sophie.mode1 branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/sophie.pbxuser branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/temp branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/werdna.pbxuser branches/Cog/stackbuild/macbuild/CroquetPlugin/ branches/Cog/stackbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/ branches/Cog/stackbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/CroquetPlugin/CroquetPlugin_Prefix.pch branches/Cog/stackbuild/macbuild/CroquetPlugin/English.lproj/ branches/Cog/stackbuild/macbuild/CroquetPlugin/English.lproj/InfoPlist.strings branches/Cog/stackbuild/macbuild/CroquetPlugin/Info.plist branches/Cog/stackbuild/macbuild/FloatArrayPlugin/ branches/Cog/stackbuild/macbuild/FloatArrayPlugin/English.lproj/ branches/Cog/stackbuild/macbuild/FloatArrayPlugin/English.lproj/InfoPlist.strings branches/Cog/stackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/ branches/Cog/stackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin_Prefix.pch branches/Cog/stackbuild/macbuild/FloatArrayPlugin/Info.plist branches/Cog/stackbuild/macbuild/FloatMathPlugin/ branches/Cog/stackbuild/macbuild/FloatMathPlugin/English.lproj/ branches/Cog/stackbuild/macbuild/FloatMathPlugin/English.lproj/InfoPlist.strings branches/Cog/stackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/ branches/Cog/stackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/FloatMathPlugin/FloatMathPlugin_Prefix.pch branches/Cog/stackbuild/macbuild/FloatMathPlugin/Info.plist branches/Cog/stackbuild/macbuild/HowToBuild branches/Cog/stackbuild/macbuild/Mpeg3Plugin/ branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin-Info.plist branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/ branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/SqueakFFIPrims/ branches/Cog/stackbuild/macbuild/SqueakFFIPrims/Info.plist branches/Cog/stackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/ branches/Cog/stackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/SqueakFFIPrims/SqueakFFIPrims_Prefix.pch branches/Cog/stackbuild/macbuild/Template/ branches/Cog/stackbuild/macbuild/Template/HowToMakeANewPlugin.txt branches/Cog/stackbuild/macbuild/Template/Info.plist branches/Cog/stackbuild/macbuild/Template/Template.xcodeproj/ branches/Cog/stackbuild/macbuild/Template/Template.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/Template/Template_Prefix.pch branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/ branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/English.lproj/ branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/English.lproj/InfoPlist.strings branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/Info.plist branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/PkgInfo branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/ branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.mode1 branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.pbxuser branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/makeit branches/Cog/stackbuild/macbuild/makeall branches/Cog/stackbuild/macbuild/makeclean branches/Cog/stackbuild/macbuild/makevm branches/Cog/stackbuild/macbuild/mkNamedPrims.sh branches/Cog/stackbuild/macbuild/mvm branches/Cog/stackbuild/macbuild/plugins.ext branches/Cog/stackbuild/macbuild/plugins.int branches/Cog/stackbuild/macbuild/resources/ branches/Cog/stackbuild/macbuild/resources/FloatMathPlugin.bundle/ branches/Cog/stackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/ branches/Cog/stackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/Info.plist branches/Cog/stackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/ branches/Cog/stackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/FloatMathPlugin branches/Cog/stackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/PkgInfo branches/Cog/stackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/Resources/ branches/Cog/stackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/stackbuild/macbuild/resources/LocalePlugin.bundle/ branches/Cog/stackbuild/macbuild/resources/LocalePlugin.bundle/Contents/ branches/Cog/stackbuild/macbuild/resources/LocalePlugin.bundle/Contents/Info.plist branches/Cog/stackbuild/macbuild/resources/LocalePlugin.bundle/Contents/MacOS/ branches/Cog/stackbuild/macbuild/resources/LocalePlugin.bundle/Contents/MacOS/LocalePlugin branches/Cog/stackbuild/macbuild/resources/LocalePlugin.bundle/Contents/PkgInfo branches/Cog/stackbuild/macbuild/resources/LocalePlugin.bundle/Contents/Resources/ branches/Cog/stackbuild/macbuild/resources/LocalePlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/ branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Headers branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/OpenAL branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Resources branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/ branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/ branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Headers/ branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Headers/al.h branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Headers/alc.h branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Headers/alctypes.h branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Headers/altypes.h branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Headers/alut.h branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/OpenAL branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Resources/ branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Resources/English.lproj/ branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Resources/English.lproj/InfoPlist.strings branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Resources/Info.plist branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/A/Resources/READ_ME branches/Cog/stackbuild/macbuild/resources/OpenAL.framework/Versions/Current branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/ branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/Croquet.icns branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/Squeak VM.r branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/Squeak.icns branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/SqueakChanges.icns branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/SqueakGeneric.icns branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/SqueakImage.icns branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/SqueakPlugin.icns branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/SqueakProject.icns branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/SqueakScript.icns branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/SqueakSources.icns branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/Teleplace.icns branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Info.plist branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/SpellCheck branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/InfoPlist.strings branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Info.plist branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/MacOS/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/MacOS/SpellingPlugin branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/PkgInfo branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/ branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/InfoPlist.strings branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/PkgInfo branches/Cog/stackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/SqueakPlugin.icns Removed: branches/Cog/macbuild/resources/PrintJobPlugin.bundle/ branches/Cog/macbuild/resources/ServicesPlugin.bundle/ branches/Cog/macbuild/resources/TestOSAPlugin.bundle/ Modified: branches/Cog/nscogsrc/examplePlugins.ext branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/Mac OS/plugins/SocketPlugin/sqMacNetwork.c branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h 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/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Log: CogVm source as per VMMaker.oscog-eem.144. Make primitiveObjectAtPut fail if used to store other than a SmallInteger into the method header. Better error message for inability to thread. Load function pointer early in ThreadedFFIPlugin's invocation checking sequence. This must come early for compatibility with the old FFIPlugin. Image-level code may assume the function pointer is loaded eagerly. Implement AndCwR & OrCwR in CogIA32Compiler. Nuke some junk in macbuild. Add untested stackbuild/{cygwinbuild,macbuild}. (time to move to mercurial?) Regenerate plugins with BytesPerWord defined. <snip>

1 0

VM Maker: VMMaker.oscog-eem.145.mcz
by commits＠source.squeak.org 19 Feb '12

19 Feb '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.145.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.145 Author: eem Time: 18 February 2012, 5:45:00.971 pm UUID: 7f3d6fd8-ce44-45ac-82f8-d0ed70d6f188 Ancestors: VMMaker.oscog-eem.144 Nuke obsolete SoundGenerationPlugin primitives. SGP gets its primitives from AbstractSound translatedPrimitives. =============== Diff against VMMaker.oscog-eem.144 =============== Item was removed: - ----- Method: SoundGenerationPlugin>>primitiveFMSoundMix (in category 'obsolete primitives') ----- - primitiveFMSoundMix - <export: true> - ^self primFMSoundmixSampleCountintostartingAtpan! Item was removed: - ----- Method: SoundGenerationPlugin>>primitiveOldSampledSoundMix (in category 'obsolete primitives') ----- - primitiveOldSampledSoundMix - <export: true> - ^self oldprimSampledSoundmixSampleCountintostartingAtleftVolrightVol! Item was removed: - ----- Method: SoundGenerationPlugin>>primitivePluckedSoundMix (in category 'obsolete primitives') ----- - primitivePluckedSoundMix - <export: true> - ^self primPluckedSoundmixSampleCountintostartingAtpan! Item was removed: - ----- Method: SoundGenerationPlugin>>primitiveSampledSoundMix (in category 'obsolete primitives') ----- - primitiveSampledSoundMix - <export: true> - ^self primSampledSoundmixSampleCountintostartingAtpan! Item was removed: - ----- Method: SoundGenerationPlugin>>primitiveWaveTableSoundMix (in category 'obsolete primitives') ----- - primitiveWaveTableSoundMix - <export: true> - ^self primWaveTableSoundmixSampleCountintostartingAtpan!

1 0

[commit] r2533 - copy some ignore properties to the stackbuild
by commits＠squeakvm.org 19 Feb '12

19 Feb '12

Author: eliot Date: 2012-02-18 15:14:48 -0800 (Sat, 18 Feb 2012) New Revision: 2533 Modified: branches/Cog/stackbuild/cygwinbuild/ branches/Cog/stackbuild/macbuild/ branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/ branches/Cog/stackbuild/macbuild/CroquetPlugin/ branches/Cog/stackbuild/macbuild/FloatArrayPlugin/ branches/Cog/stackbuild/macbuild/FloatMathPlugin/ branches/Cog/stackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/ branches/Cog/stackbuild/macbuild/SqueakFFIPrims/ branches/Cog/stackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/ branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin/ Log: copy some ignore properties to the stackbuild Property changes on: branches/Cog/stackbuild/cygwinbuild ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/stackbuild/macbuild ___________________________________________________________________ Added: svn:ignore + build *.app *.bundle LOG* *.sources Property changes on: branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj ___________________________________________________________________ Added: svn:ignore + *.pbxuser *.mode* Property changes on: branches/Cog/stackbuild/macbuild/CroquetPlugin ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/stackbuild/macbuild/FloatArrayPlugin ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/stackbuild/macbuild/FloatMathPlugin ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/stackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj ___________________________________________________________________ Added: svn:ignore + *.pbxuser *.mode* Property changes on: branches/Cog/stackbuild/macbuild/SqueakFFIPrims ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/stackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj ___________________________________________________________________ Added: svn:ignore + eliot.* Property changes on: branches/Cog/stackbuild/macbuild/UnixOSProcessPlugin ___________________________________________________________________ Added: svn:ignore + build

1 0

VM Maker: VMMaker-oscog-EstebanLorenzano.144.mcz
by commits＠source.squeak.org 18 Feb '12

18 Feb '12

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-EstebanLorenzano.144.mcz ==================== Summary ==================== Name: VMMaker-oscog-EstebanLorenzano.144 Author: EstebanLorenzano Time: 18 February 2012, 10:37:50 am UUID: 5248dc9f-6e7c-499e-a1d6-3e29d9726539 Ancestors: VMMaker-oscog-IgorStasenko.143 -#primitiveGetNextEvent now processing complex evenbts (for touch events) -#readImageFromFile:HeapSize:StartingAt: now uses sqImageFileReadEntireImage -IA32ABIPlugin>>#primInIOProcessEventsFlagAddress now has a preprocessor directive, because it is not being used with __APPLE__ platforms =============== Diff against VMMaker-oscog-IgorStasenko.143 =============== 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-Alien'! + SystemOrganization addCategory: #'VMMaker-Plugins-Touch'! Item was changed: ----- Method: CCodeGenerator>>emitCHeaderOn: (in category 'C code generator') ----- emitCHeaderOn: aStream "Emit the initial part of a source file on aStream, comprising the version stamp, the global struct usage flags, the header files and preamble code." | headerClass | headerClass := [vmClass coreInterpreterClass] on: MessageNotUnderstood do: [:ex| vmClass]. aStream nextPutAll: (self fileHeaderVersionStampForSourceClass: headerClass); cr; cr. self emitGlobalStructFlagOn: aStream. headerFiles addFirst: '"sq.h"'. vmClass isInterpreterClass ifTrue: [headerFiles addLast: '"sqMemoryAccess.h"']. "Additional header files; include C library ones first." self emitHeaderFiles: (headerFiles select: [:hdr| hdr includes: $<]) on: aStream. "Additional header files; include squeak VM ones last" self emitHeaderFiles: (headerFiles reject: [:hdr| hdr includes: $<]) on: aStream. vmClass isInterpreterClass ifTrue: [aStream cr; cr; nextPutAll: vmClass preambleCCode]. aStream cr! Item was changed: ----- Method: IA32ABIPlugin>>primInIOProcessEventsFlagAddress (in category 'primitives-Windows-VM-specific') ----- primInIOProcessEventsFlagAddress "Answer the address of the int inIOProcessEvents flag. This can be used to disable invocation of ioProcessEvents and is for backward-compatibility. Please use the core VM primitiveEventProcessingControl in new code." | address | <export: true> self + cCode: ' + #ifndef __APPLE__ //Apple platform does not use this anymore + { extern int inIOProcessEvents; address = (sqInt)&inIOProcessEvents; } + #endif' - cCode: '{ extern int inIOProcessEvents; address = (sqInt)&inIOProcessEvents; }' inSmalltalk: [address := 0]. interpreterProxy methodReturnValue: (interpreterProxy positive32BitIntegerFor: address)! Item was added: + SmartSyntaxInterpreterPlugin subclass: #IOSPlugin + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: 'VMBasicConstants' + category: 'VMMaker-Plugins-Touch'! Item was added: + ----- Method: IOSPlugin>>primitiveShowKeyboard: (in category 'primitives') ----- + primitiveShowKeyboard: showBoolean + <export: true> + <var: #showBoolean type: #int> + + self sqShowKeyboard: showBoolean.! Item was changed: ----- Method: InterpreterPrimitives>>primitiveGetNextEvent (in category 'I/O primitives') ----- primitiveGetNextEvent "Primitive. Return the next input event from the VM event queue." + | evtBuf arg value eventTypeIs | - | evtBuf arg value | <var: #evtBuf declareC:'int evtBuf[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }'> self cCode:'' inSmalltalk:[evtBuf := CArrayAccessor on: (IntegerArray new: 8)]. arg := self stackTop. ((objectMemory isArray: arg) and:[(objectMemory slotSizeOf: arg) = 8]) ifFalse:[^self primitiveFail]. self ioGetNextEvent: (self cCoerce: evtBuf to: 'sqInputEvent*'). self successful ifFalse:[^nil]. "Event type" + eventTypeIs := evtBuf at: 0. self storeInteger: 0 ofObject: arg withValue: (evtBuf at: 0). self successful ifFalse:[^nil]. + "Event is Complex, assume evtBuf is populated correctly and return" + eventTypeIs = 6 + ifTrue: [ + 1 to: 7 do: [:i | + value := evtBuf at: i. + self storePointer: i ofObject: arg withValue: value]] + ifFalse: [ + "Event time stamp" + self storeInteger: 1 ofObject: arg withValue: ((evtBuf at: 1) bitAnd: MillisecondClockMask). + self successful ifFalse:[^nil]. - "Event time stamp" - self storeInteger: 1 ofObject: arg withValue: ((evtBuf at: 1) bitAnd: MillisecondClockMask). - self successful ifFalse:[^nil]. + "Event arguments" + 2 to: 7 do:[:i| + value := evtBuf at: i. + (objectMemory isIntegerValue: value) + ifTrue:[self storeInteger: i ofObject: arg withValue: value] + ifFalse:[ + value := self positive32BitIntegerFor: value. + objectMemory storePointer: i ofObject: arg withValue: value] ] ]. - "Event arguments" - 2 to: 7 do:[:i| - value := evtBuf at: i. - (objectMemory isIntegerValue: value) - ifTrue:[self storeInteger: i ofObject: arg withValue: value] - ifFalse:[value := self positive32BitIntegerFor: value. - objectMemory storePointer: i ofObject: arg withValue: value]]. self successful ifFalse:[^nil]. self pop: 1! Item was changed: ----- Method: StackInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory." "Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." "This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!" | swapBytes headerStart headerSize dataSize oldBaseAddr hdrNumStackPages minimumMemory memStart bytesRead bytesToShift heapSize hdrEdenBytes headerFlags hdrMaxExtSemTabSize | <var: #f type: 'sqImageFile '> <var: #memStart type: 'usqInt'> <var: #desiredHeapSize type: 'usqInt'> <var: #headerStart type: 'squeakFileOffsetType '> <var: #dataSize type: 'size_t '> <var: #imageOffset type: 'squeakFileOffsetType '> metaclassSizeBytes := 6 * BytesPerWord. "guess (Metaclass instSize * BPW)" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - BytesPerWord. "record header start position" headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to images run on Cog." theUnknownShort := self getShortFromFile: f swap: swapBytes. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "decrease Squeak object heap to leave extra memory for the VM" heapSize := self cCode: 'reserveExtraCHeapBytes(desiredHeapSize, extraVMMemory)'. "compare memory requirements with availability". minimumMemory := dataSize + objectMemory edenBytes + self interpreterAllocationReserveBytes. heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]. "allocate a contiguous block of memory for the Squeak heap" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize). objectMemory memory = nil ifTrue: [self insufficientMemoryAvailableError]. memStart := objectMemory startOfMemory. objectMemory setMemoryLimit: (memStart + heapSize) - 24. "decrease memoryLimit a tad for safety" objectMemory setEndOfMemory: memStart + dataSize. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" + bytesRead := self cCode: 'sqImageFileReadEntireImage(pointerForOop(memory), sizeof(unsigned char), dataSize, f)'. - bytesRead := self cCode: 'sqImageFileRead(pointerForOop(memory), sizeof(unsigned char), dataSize, f)'. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := memStart - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" ^dataSize !

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.150.mcz
by commits＠source.squeak.org 18 Feb '12

18 Feb '12

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.150.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.150 Author: EstebanLorenzano Time: 18 February 2012, 10:41 am UUID: 95a995a2-24cc-41d0-83a4-4f2c56d396b6 Ancestors: CMakeVMMaker-EstebanLorenzano.149 TouchPlugin renamed to IOSPlugin =============== Diff against CMakeVMMaker-EstebanLorenzano.149 =============== Item was added: + ----- Method: StackIPhoneConfig>>configureIOSPlugin: (in category 'plugin extra rules') ----- + configureIOSPlugin: maker + maker + addSources: #('sqTouch.m' ) + prefixed: '${platformsDir}/iOS/vm/iPhone/plugins/TouchPlugin/' + ! Item was removed: - ----- Method: StackIPhoneConfig>>configureTouchPlugin: (in category 'plugin extra rules') ----- - configureTouchPlugin: maker - maker - addSources: #('sqTouch.m' ) - prefixed: '${platformsDir}/iOS/vm/iPhone/plugins/TouchPlugin/' - ! Item was changed: ----- Method: StackIPhoneConfig>>defaultInternalPlugins (in category 'settings') ----- defaultInternalPlugins ^ #( ADPCMCodecPlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DSAPlugin DeflatePlugin "DropPlugin" FFTPlugin FilePlugin FloatArrayPlugin HostWindowPlugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin "RePlugin" SecurityPlugin "SocketPlugin" SoundCodecPlugin SoundGenerationPlugin SoundPlugin SurfacePlugin UUIDPlugin ObjectiveCPlugin + #IOSPlugin)! - TouchPlugin)!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2012