Vm-dev November 2011

vm-dev@lists.squeakfoundation.org

20 participants
52 discussions

Start a nNew thread

Crash while debugging with Cog VM
by Hernán Morales Durand 20 Nov '11

20 Nov '11

Attached crash.dmp

2 2

VM Maker: VMMaker-oscog-EstebanLorenzano.140.mcz
by commits＠source.squeak.org 18 Nov '11

18 Nov '11

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-EstebanLorenzano.140.mcz ==================== Summary ==================== Name: VMMaker-oscog-EstebanLorenzano.140 Author: EstebanLorenzano Time: 18 November 2011, 6:03:18 pm UUID: 1961b8af-fb68-4813-89a9-67f2401441d0 Ancestors: VMMaker-oscog-EstebanLorenzano.139, VMMaker.oscog-eem.139 -merged with Eliot's 139. Everything seems to work =============== Diff against VMMaker-oscog-EstebanLorenzano.139 =============== Item was changed: ----- Method: CogMethodZone>>compactCompiledCode: (in category 'compaction') ----- compactCompiledCode: objectHeaderValue | source dest bytes | <var: #source type: #'CogMethod *'> <var: #dest type: #'CogMethod *'> source := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. openPICList := nil. [source < self limitZony and: [source cmType ~= CMFree]] whileTrue: [self assert: (cogit cogMethodDoesntLookKosher: source) = 0. source objectHeader: objectHeaderValue. source cmUsageCount > 0 ifTrue: [source cmUsageCount: source cmUsageCount // 2]. source cmType = CMOpenPIC ifTrue: [source nextOpenPIC: openPICList asUnsignedInteger. openPICList := source]. source := self methodAfter: source]. source >= self limitZony ifTrue: [^self halt: 'no free methods; cannot compact.']. dest := source. [source < self limitZony] whileTrue: [self assert: (cogit maybeFreeCogMethodDoesntLookKosher: source) = 0. bytes := source blockSize. source cmType ~= CMFree ifTrue: [self mem: dest mo: source ve: bytes. dest objectHeader: objectHeaderValue. dest cmType = CMMethod ifTrue: ["For non-Newspeak there should ne a one-to-one mapping metween bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." self assert: ((coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger + or: [(cogit noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject]). - or: [(coInterpreter noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject]). "Only update the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger ifTrue: [coInterpreter rawHeaderOf: dest methodObject put: dest asInteger]] ifFalse: [dest cmType = CMOpenPIC ifTrue: [dest nextOpenPIC: openPICList asUnsignedInteger. openPICList := dest]]. dest cmUsageCount > 0 ifTrue: [dest cmUsageCount: dest cmUsageCount // 2]. dest := coInterpreter cCoerceSimple: dest asInteger + bytes to: #'CogMethod *']. source := coInterpreter cCoerceSimple: source asInteger + bytes to: #'CogMethod *']. mzFreeStart := dest asInteger. methodBytesFreedSinceLastCompaction := 0! Item was removed: - ----- Method: CogVMSimulator>>printCallStackOf: (in category 'debug printing') ----- - printCallStackOf: aContext - self printCallStackOf: aContext currentFP: localFP! 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]). - or: [(coInterpreter 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]]. 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: ----- Method: Cogit>>mapObjectReferencesInMachineCodeForBecome (in category 'garbage collection') ----- mapObjectReferencesInMachineCodeForBecome "Update all references to objects in machine code for a become. Unlike incrementalGC or fullGC a method that does not refer to young may refer to young as a result of the become operation." | cogMethod hasYoungObj hasYoungObjPtr freedPIC | <var: #cogMethod type: #'CogMethod *'> hasYoungObj := false. hasYoungObjPtr := self cCode: [(self addressOf: hasYoungObj) asInteger] inSmalltalk: [CPluggableAccessor new setObject: nil; atBlock: [:obj :idx| hasYoungObj] atPutBlock: [:obj :idx :val| hasYoungObj := val]]. codeModified := freedPIC := false. self mapObjectReferencesInGeneratedRuntime. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [self assert: hasYoungObj not. cogMethod cmType ~= CMFree ifTrue: [self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0. cogMethod selector: (objectRepresentation remapOop: cogMethod selector).. cogMethod cmType = CMClosedPIC ifTrue: [((objectMemory isYoung: cogMethod selector) or: [self mapObjectReferencesInClosedPIC: cogMethod]) ifTrue: [freedPIC := true. methodZone freeMethod: cogMethod]] ifFalse: [(objectMemory isYoung: cogMethod selector) ifTrue: [hasYoungObj := true]. cogMethod cmType = CMMethod ifTrue: [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject). self assert: ((coInterpreter rawHeaderOf: cogMethod methodObject) = cogMethod asInteger + or: [(self noAssertMethodClassAssociationOf: cogMethod methodObject) - or: [(coInterpreter noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject]). (objectMemory isYoung: cogMethod methodObject) ifTrue: [hasYoungObj := true]]. self mapFor: cogMethod performUntil: (self cppIf: NewspeakVM ifTrue: [#remapNSIfObjectRef:pc:hasYoung: asSymbol] ifFalse: [#remapIfObjectRef:pc:hasYoung: asSymbol]) arg: hasYoungObjPtr. hasYoungObj ifTrue: [cogMethod cmRefersToYoung ifFalse: [cogMethod cmRefersToYoung: true. methodZone addToYoungReferrers: cogMethod]. hasYoungObj := false] ifFalse: [cogMethod cmRefersToYoung: false]]]. cogMethod := methodZone methodAfter: cogMethod]. methodZone pruneYoungReferrers. freedPIC ifTrue: [self unlinkSendsToFree. codeModified := true]. codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." [processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>interpretAddress (in category 'accessing') ----- + interpretAddress + ^self addressForLabel: #interpret! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>primitiveFailAddress (in category 'accessing') ----- + primitiveFailAddress + ^self addressForLabel: #primitiveFail! Item was changed: ----- Method: IA32ABIPlugin class>>simulatorClass (in category 'simulation only') ----- simulatorClass + ^NewspeakVM ifFalse: [IA32ABIPluginSimulator]! - ^IA32ABIPluginSimulator! Item was added: + ----- Method: IA32ABIPluginSimulator>>longAt: (in category 'memory access') ----- + longAt: byteAddress + ^interpreterProxy longAt: byteAddress! Item was added: + ----- Method: IA32ABIPluginSimulator>>longAt:put: (in category 'memory access') ----- + longAt: byteAddress put: a32BitValue + ^interpreterProxy longAt: byteAddress put: a32BitValue! Item was added: + ----- Method: NewCoObjectMemorySimulator class>>vmProxyMajorVersion (in category 'simulation only') ----- + vmProxyMajorVersion + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^CoInterpreter vmProxyMajorVersion! Item was added: + ----- Method: NewCoObjectMemorySimulator class>>vmProxyMinorVersion (in category 'simulation only') ----- + vmProxyMinorVersion + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^CoInterpreter vmProxyMinorVersion! Item was added: + ----- Method: NewCoObjectMemorySimulator>>internalIsImmutable: (in category 'simulation only') ----- + internalIsImmutable: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter internalIsImmutable: oop! Item was added: + ----- Method: NewCoObjectMemorySimulator>>methodReturnValue: (in category 'simulation only') ----- + methodReturnValue: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter methodReturnValue: oop! Item was added: + ----- Method: NewCoObjectMemorySimulator>>signed32BitIntegerFor: (in category 'simulation only') ----- + signed32BitIntegerFor: integerValue + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter signed32BitIntegerFor: integerValue! Item was added: + ----- Method: NewCoObjectMemorySimulator>>signed32BitValueOf: (in category 'simulation only') ----- + signed32BitValueOf: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter signed32BitValueOf: oop! Item was changed: ----- Method: NewspeakInterpreter>>shortPrintOop: (in category 'debug printing') ----- shortPrintOop: oop <inline: false> + self printHex: oop. - self printNum: oop. (self isIntegerObject: oop) ifTrue: [^self cCode: 'printf("=%ld\n", integerValueOf(oop))' inSmalltalk: [self print: (self shortPrint: oop); cr]]. (oop between: self startOfMemory and: freeBlock) ifFalse: [self printHex: oop; print: ' is not on the heap'; cr. ^nil]. (oop bitAnd: (BytesPerWord - 1)) ~= 0 ifTrue: [self printHex: oop; print: ' is misaligned'; cr. ^nil]. self print: ': a(n) '. self printNameOfClass: (self fetchClassOf: oop) count: 5. self cr! Item was changed: ----- Method: NewsqueakIA32ABIPlugin class>>simulatorClass (in category 'simulation only') ----- simulatorClass + ^NewspeakVM ifTrue: [NewsqueakIA32ABIPluginSimulator]! - ^NewsqueakIA32ABIPluginSimulator! Item was changed: + NewsqueakIA32ABIPlugin subclass: #NewsqueakIA32ABIPluginSimulator - IA32ABIPlugin subclass: #NewsqueakIA32ABIPluginSimulator instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Plugins-Alien'! Item was added: + ----- Method: NewsqueakIA32ABIPluginSimulator>>longAt: (in category 'memory access') ----- + longAt: byteAddress + ^interpreterProxy longAt: byteAddress! Item was added: + ----- Method: NewsqueakIA32ABIPluginSimulator>>longAt:put: (in category 'memory access') ----- + longAt: byteAddress put: a32BitValue + ^interpreterProxy longAt: byteAddress put: a32BitValue! Item was changed: ----- Method: StackInterpreter>>activeProcess (in category 'process primitive support') ----- activeProcess "Answer the current activeProcess." + <api> "useful for VM debugging" ^objectMemory fetchPointer: ActiveProcessIndex ofObject: self schedulerPointer! Item was added: + ----- Method: StackInterpreter>>internalIsImmutable: (in category 'object format') ----- + internalIsImmutable: oop + <option: #NewspeakVM> + <inline: true> + <export: true> + ^((objectMemory baseHeader: oop) bitAnd: ImmutabilityBit) ~= 0! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <api> | fmt lastIndex startIP bytecodesPerLine | ((objectMemory isIntegerObject: oop) or: [(oop between: objectMemory startOfMemory and: objectMemory freeStart) not or: [(oop bitAnd: (BytesPerWord - 1)) ~= 0 or: [(objectMemory isFreeObject: oop) or: [(fmt := objectMemory formatOf: oop) between: 5 and: 11]]]]) ifTrue: [^self printOop: oop]. self printHex: oop; print: ': a(n) '; printNameOfClass: (objectMemory fetchClassOfNonInt: oop) count: 5. fmt > 4 ifTrue: [self print: ' nbytes '; printNum: (objectMemory byteSizeOf: oop)]. self cr. lastIndex := 64 min: (startIP := (objectMemory lastPointerOf: oop) / BytesPerWord). lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| | fieldOop | fieldOop := objectMemory fetchPointer: index - 1 ofObject: oop. self space; printHex: fieldOop; space; printOopShort: fieldOop; cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * BytesPerWord + 1. lastIndex := objectMemory lengthOf: oop. + lastIndex - startIP > 104 ifTrue: + [lastIndex := startIP + 103]. - lastIndex - startIP > 100 ifTrue: - [lastIndex := startIP + 100]. bytecodesPerLine := 8. startIP to: lastIndex do: [:index| | byte | byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. + (index = lastIndex and: [(objectMemory lengthOf: oop) > index]) ifTrue: + [self print: '...']. ((index - startIP + 1) \\ bytecodesPerLine) = 0 ifTrue: [self cr]]. ((lastIndex - startIP + 1) \\ bytecodesPerLine) = 0 ifFalse: [self cr]]! Item was changed: ----- Method: StackInterpreter>>printContext: (in category 'debug printing') ----- printContext: aContext | sender ip sp | <inline: false> self shortPrintContext: aContext. sender := objectMemory fetchPointer: SenderIndex ofObject: aContext. ip := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. (objectMemory isIntegerObject: sender) ifTrue: [(self checkIsStillMarriedContext: aContext currentFP: framePointer) ifTrue: [self print: 'married (assuming framePointer valid)'; cr] ifFalse: [self print: 'widdowed (assuming framePointer valid)'; cr]. self print: 'sender '; printNum: sender; print: ' ('; printHexPtr: (self withoutSmallIntegerTags: sender); printChar: $); cr. self print: 'ip '; printNum: ip; print: ' ('; printHexPtr: (self withoutSmallIntegerTags: ip); printChar: $); cr] ifFalse: [self print: 'sender '; shortPrintOop: sender. + self print: 'ip '. + ip = objectMemory nilObject + ifTrue: [self shortPrintOop: ip] + ifFalse: [self printNum: ip; print: ' ('; printNum: (objectMemory integerValueOf: ip); space; printHex: (objectMemory integerValueOf: ip); printChar: $); cr]]. - self print: 'ip '; printNum: ip; print: ' ('; printNum: (objectMemory integerValueOf: ip); space; printHex: (objectMemory integerValueOf: ip); printChar: $); cr]. sp := objectMemory fetchPointer: StackPointerIndex ofObject: aContext. sp := sp min: (objectMemory lengthOf: aContext) - ReceiverIndex. self print: 'sp '; printNum: sp; print: ' ('; printNum: (objectMemory integerValueOf: sp); printChar: $); cr. self print: 'method '; shortPrintOop: (objectMemory fetchPointer: MethodIndex ofObject: aContext). self print: 'closure '; shortPrintOop: (objectMemory fetchPointer: ClosureIndex ofObject: aContext). self print: 'receiver '; shortPrintOop: (objectMemory fetchPointer: ReceiverIndex ofObject: aContext). sp := objectMemory integerValueOf: sp. 1 to: sp do: [:i| self print: ' '; printNum: i; space; shortPrintOop: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]! Item was changed: ----- Method: StackInterpreter>>shortPrintContext: (in category 'debug printing') ----- shortPrintContext: aContext + | home theFP | - | home | <inline: false> + <var: #theFP type: #'char *'> (self isContext: aContext) ifFalse: [self printHex: aContext; print: ' is not a context'; cr. ^nil]. home := self findHomeForContext: aContext. + self printHex: aContext. - self printNum: aContext. (self isMarriedOrWidowedContext: aContext) + ifTrue: [(self checkIsStillMarriedContext: aContext currentFP: framePointer) + ifTrue: + [(self isMachineCodeFrame: (theFP := self frameOfMarriedContext: aContext)) + ifTrue: [self print: ' M ('] + ifFalse: [self print: ' I (']. + self printHex: theFP; print: ') '] + ifFalse: + [self print: ' w ']] - ifTrue: [((self checkIsStillMarriedContext: aContext currentFP: framePointer) - and: [self isMachineCodeFrame: (self frameOfMarriedContext: aContext)]) - ifTrue: [self print: ' m '] - ifFalse: [self print: ' i ']] ifFalse: [self print: ' s ']. self printActivationNameFor: (objectMemory fetchPointer: MethodIndex ofObject: home) receiver: (objectMemory fetchPointer: ReceiverIndex ofObject: home) isBlock: home ~= aContext firstTemporary: (objectMemory fetchPointer: 0 + CtxtTempFrameStart ofObject: home). self cr! Item was changed: ----- Method: StackInterpreter>>shortPrintFrame: (in category 'debug printing') ----- shortPrintFrame: theFP <inline: false> <var: #theFP type: #'char *'> | rcvr | + (stackPages couldBeFramePointer: theFP) ifFalse: + [self print: 'invalid frame pointer'; cr. - theFP = 0 ifTrue: - [self print: 'null fp'; cr. ^nil]. rcvr := self frameReceiver: theFP. self printHexPtr: theFP. self space. self printActivationNameFor: (self frameMethod: theFP) receiver: rcvr isBlock: (self frameIsBlockActivation: theFP) firstTemporary: (self temporary: 0 in: theFP). self space. self shortPrintOop: rcvr "shortPrintOop: adds a cr"! Item was changed: ----- Method: StackInterpreter>>shortPrintFrame:AndNCallers: (in category 'debug printing') ----- shortPrintFrame: theFP AndNCallers: n <api> <inline: false> <var: #theFP type: #'char *'> + (n ~= 0 and: [stackPages couldBeFramePointer: theFP]) ifTrue: - (n > 0 and: [stackPages couldBeFramePointer: theFP]) ifTrue: [self shortPrintFrame: theFP. self shortPrintFrame: (self frameCallerFP: theFP) AndNCallers: n - 1]! Item was removed: - ----- Method: StackInterpreterSimulator>>printCallStackOf: (in category 'debug printing') ----- - printCallStackOf: aContext - self printCallStackOf: aContext currentFP: localFP! Item was added: + ----- Method: StackToRegisterMappingCogit>>isValidFramelessRegister: (in category 'testing') ----- + isValidFramelessRegister: reg + "Answer if the receiver is valid in a frameless method." + ^reg = ReceiverResultReg or: [reg = Arg0Reg]! Item was changed: ----- Method: StackToRegisterMappingCogit>>ssFlushUpThroughReceiverVariable: (in category 'simulation stack') ----- ssFlushUpThroughReceiverVariable: slotIndex + "Any occurrences on the stack of the value being stored (which is the top of stack) + must be flushed, and hence any values colder than them stack." - "Any occurrences on the stack of the value being stored must - be flushed, and hence any values colder than them stack." <var: #desc type: #'CogSimStackEntry *'> + simStackPtr - 1 to: (simSpillBase max: 0) by: -1 do: - simStackPtr to: (simSpillBase max: 0) by: -1 do: [:index| | desc | desc := self simStackAt: index. (desc type = SSBaseOffset and: [desc register = ReceiverResultReg and: [desc offset = (objectRepresentation slotOffsetOfInstVarIndex: slotIndex)]]) ifTrue: [self ssFlushTo: index. ^self]]! Item was changed: ----- Method: StackToRegisterMappingCogit>>ssFlushUpThroughTemporaryVariable: (in category 'simulation stack') ----- ssFlushUpThroughTemporaryVariable: tempIndex + "Any occurrences on the stack of the value being stored (which is the top of stack) + must be flushed, and hence any values colder than them stack." - "Any occurrences on the stack of the value being stored must - be flushed, and hence any values colder than them stack." <var: #desc type: #'CogSimStackEntry *'> + simStackPtr - 1 to: simSpillBase by: -1 do: - simStackPtr to: simSpillBase by: -1 do: [:index| | desc | desc := self simStackAt: index. (desc type = SSBaseOffset and: [desc register = FPReg and: [desc offset = (self frameOffsetOfTemporary: tempIndex)]]) ifTrue: [self ssFlushTo: index. ^self]]! Item was changed: ----- Method: VMMaker>>logDateAndTime (in category 'UI access') ----- logDateAndTime + | now | + "do it this way since Time now includes milliseconds in some versions." + now := Time dateAndTimeNow. + logger print: now first; space; print: now last; cr; flush! - logger print: Date today; space; print: Time now; cr; flush.!

1 0

New Cog VMs available [was [squeak-dev] VM cog crash]
by Eliot Miranda 18 Nov '11

18 Nov '11

Hi All, new VMs at http://www.mirandabanda.org/files/Cog/VM/VM.r2515/. These fix a code generator bug and as a result produce slightly better code in rare circumstances. Anyway, Hans' case below will no longer crash the VM :) Enjoy. On Thu, Nov 17, 2011 at 5:38 AM, Baveco, Hans <Hans.Baveco(a)wur.nl> wrote: > I managed to crash the (latest) cog VM consistently, producing the > attached crash dump (containing two crashes). > Debugging the code carefully I found that somewhere in the process of > setting an instance variable of an object at the top of a tree-like > structure, by traversing the tree downwards and back (lazy initializing > instance variables), a clearly wrong method was executed: > > setCenter: aPoint > > center := center > > > after correcting this the crashes didn't occur anymore. > Not sure how important this is, but surprising it was, though! > > Hans > > > > -- best, Eliot

1 0

[commit] r2514 - CogVM source as per VMMaker.oscog-eem.138.
by commits＠squeakvm.org 18 Nov '11

18 Nov '11

Author: eliot Date: 2011-11-17 17:18:02 -0800 (Thu, 17 Nov 2011) New Revision: 2514 Modified: 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/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 Log: CogVM source as per VMMaker.oscog-eem.138. Fix frameless foo: arg instVar := instVar code gen bug (failure to pop spills on frameless return). Use more hex printing in frame/oop printing. Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/nscogsrc/vm/cogit.c 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba + CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d from - StackToRegisterMappingCogit VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba + StackToRegisterMappingCogit VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -805,6 +805,7 @@ sqInt isSendReturnPC(sqInt retpc); static sqInt isSmallIntegerTagNonZero(void); static sqInt isUnconditionalBranch(BytecodeDescriptor * self_in_isUnconditionalBranch); +static sqInt isValidFramelessRegister(sqInt reg); static AbstractInstruction * gJumpFPEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreaterOrEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreater(void *jumpTarget); @@ -963,6 +964,7 @@ static void ssFlushTo(sqInt index); static void ssFlushUpThroughReceiverVariable(sqInt slotIndex); static void ssFlushUpThroughTemporaryVariable(sqInt tempIndex); +static void ssPopSpillsFrom(sqInt index); static void ssPop(sqInt n); static sqInt ssPushAnnotatedConstant(sqInt literal); static sqInt ssPushBaseoffset(sqInt reg, sqInt offset); @@ -12493,6 +12495,7 @@ genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } else { + ssPopSpillsFrom(methodOrBlockNumArgs - 1); /* begin RetN: */ offset = ((methodOrBlockNumArgs > (numRegArgs())) || (regArgsHaveBeenPushed) @@ -13254,6 +13257,16 @@ } +/* Answer if the receiver is valid in a frameless method. */ + +static sqInt +isValidFramelessRegister(sqInt reg) +{ + return (reg == ReceiverResultReg) + || (reg == Arg0Reg); +} + + /* Floating-point jumps are a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -16539,7 +16552,10 @@ } if (simSpillBase <= index) { for (i = (((simSpillBase < 0) ? 0 : simSpillBase)); i <= index; i += 1) { - assert(needsFrame); + assert(needsFrame + || (((((simStackAt(i)->type)) == SSBaseOffset) + || (((simStackAt(i)->type)) == SSRegister)) + && (isValidFramelessRegister((simStackAt(i)->registerr))))); ensureSpilledAtfrom(simStackAt(i), frameOffsetOfTemporary(i), FPReg); } simSpillBase = index + 1; @@ -16588,7 +16604,24 @@ } } + +/* Pop any spilled items on the sim stack from index, used to balance the + stack on return. + */ + static void +ssPopSpillsFrom(sqInt index) +{ + sqInt i; + + for (i = index; i <= simStackPtr; i += 1) { + if ((simStackAt(i)->spilled)) { + popToReg(ssTop(), TempReg); + } + } +} + +static void ssPop(sqInt n) { assert(((simStackPtr - n) >= (methodOrBlockNumTemps - 1)) Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/nscogsrc/vm/cogit.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba + CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba + CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/nscogsrc/vm/cointerp.c 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d from - CoInterpreter VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CoInterpreter VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -330,6 +330,7 @@ sqInt interpret(void); static void activateCoggedNewMethod(sqInt inInterpreter); static void activateNewMethod(void); +sqInt activeProcess(void); EXPORT(sqInt) addGCRoot(sqInt *varLoc); static void addLastLinktoList(sqInt proc, sqInt aList); static void addNewMethodToCache(sqInt class); @@ -586,6 +587,7 @@ sqInt integerArg(sqInt index); sqInt integerObjectOf(sqInt value); sqInt integerValueOf(sqInt objectPointer); +EXPORT(sqInt) internalIsImmutable(sqInt oop); usqInt interpretAddress(void); static sqInt interpreterAllocationReserveBytes(void); static sqInt interpretMethodFromMachineCode(void); @@ -1898,7 +1900,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.137"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.138"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -8924,6 +8926,16 @@ } +/* Answer the current activeProcess. */ +/* useful for VM debugging */ + +sqInt +activeProcess(void) +{ + return longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); +} + + /* Add the given variable location to the extra roots table */ EXPORT(sqInt) @@ -19120,7 +19132,13 @@ } } +EXPORT(sqInt) +internalIsImmutable(sqInt oop) +{ + return ((longAt(oop)) & ImmutabilityBit) != 0; +} + /* This is used for asserts that check that inline cache editing results in valid addresses. In the C VM interpret is presumed to come before any primitives and so it @@ -20424,13 +20442,17 @@ goto l1; } l1: /* end lengthOf: */; - if ((lastIndex - startIP) > 100) { - lastIndex = startIP + 100; + if ((lastIndex - startIP) > 104) { + lastIndex = startIP + 103; } bytecodesPerLine = 8; for (index = startIP; index <= lastIndex; index += 1) { byte = byteAt((oop + BaseHeaderSize) + (index - 1)); printf(" %02x/%-3d", byte,byte); + if ((index == lastIndex) + && ((lengthOf(oop)) > index)) { + print("..."); + } if ((((index - startIP) + 1) % bytecodesPerLine) == 0) { /* begin cr */ printf("\n"); @@ -38290,7 +38312,7 @@ void printContext(sqInt aContext) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt ip; void *p; @@ -38341,17 +38363,22 @@ print("sender "); shortPrintOop(sender); print("ip "); - printNum(ip); - print(" ("); - printNum((ip >> 1)); - /* begin space */ - /* begin printChar: */ - putchar(' '); - printHex((ip >> 1)); - /* begin printChar: */ - putchar(')'); - /* begin cr */ - printf("\n"); + if (ip == GIV(nilObj)) { + shortPrintOop(ip); + } + else { + printNum(ip); + print(" ("); + printNum((ip >> 1)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex((ip >> 1)); + /* begin printChar: */ + putchar(')'); + /* begin cr */ + printf("\n"); + } } sp = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); sp = ((sp < ((lengthOf(aContext)) - ReceiverIndex)) ? sp : ((lengthOf(aContext)) - ReceiverIndex)); @@ -41906,6 +41933,7 @@ shortPrintContext(sqInt aContext) { sqInt home; + char *theFP; if (!(((aContext & 1) == 0) && (((((usqInt) (longAt(aContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -41916,14 +41944,20 @@ return; } home = findHomeForContext(aContext); - printNum(aContext); + printHex(aContext); if (((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { - if ((checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) - && (isMachineCodeFrame(frameOfMarriedContext(aContext)))) { - print(" m "); + if (checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) { + if (isMachineCodeFrame((theFP = frameOfMarriedContext(aContext)))) { + print(" M ("); + } + else { + print(" I ("); + } + printHex(theFP); + print(") "); } else { - print(" i "); + print(" w "); } } else { @@ -41998,7 +42032,7 @@ void shortPrintFrameAndNCallers(char *theFP, sqInt n) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if ((n > 0) + if ((n != 0) && ((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { shortPrintFrame(theFP); @@ -45643,6 +45677,7 @@ {"", "callbackEnter", (void*)callbackEnter}, {"", "callbackLeave", (void*)callbackLeave}, {"", "dumpImage", (void*)dumpImage}, + {"", "internalIsImmutable", (void*)internalIsImmutable}, {"", "moduleUnloaded", (void*)moduleUnloaded}, {"", "primitiveAddLargeIntegers", (void*)primitiveAddLargeIntegers}, {"", "primitiveBitAndLargeIntegers", (void*)primitiveBitAndLargeIntegers}, Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/nscogsrc/vm/cointerp.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,9 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ /*** Function Prototypes ***/ +sqInt activeProcess(void); sqInt addressCouldBeObj(sqInt address); sqInt addressCouldBeOop(sqInt address); usqInt argumentCountAddress(void); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-11-18 01:18:02 UTC (rev 2514) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d from - CoInterpreter VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CoInterpreter VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -333,6 +333,7 @@ sqInt interpret(void); static void activateCoggedNewMethod(sqInt inInterpreter); static void activateNewMethod(void); +sqInt activeProcess(void); EXPORT(sqInt) addGCRoot(sqInt *varLoc); static void addLastLinktoList(sqInt proc, sqInt aList); static void addNewMethodToCache(sqInt class); @@ -589,6 +590,7 @@ sqInt integerArg(sqInt index); sqInt integerObjectOf(sqInt value); sqInt integerValueOf(sqInt objectPointer); +EXPORT(sqInt) internalIsImmutable(sqInt oop); usqInt interpretAddress(void); static sqInt interpreterAllocationReserveBytes(void); static sqInt interpretMethodFromMachineCode(void); @@ -1901,7 +1903,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.137"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.138"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -8928,6 +8930,16 @@ } +/* Answer the current activeProcess. */ +/* useful for VM debugging */ + +sqInt +activeProcess(void) +{ + return longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); +} + + /* Add the given variable location to the extra roots table */ EXPORT(sqInt) @@ -19124,7 +19136,13 @@ } } +EXPORT(sqInt) +internalIsImmutable(sqInt oop) +{ + return ((longAt(oop)) & ImmutabilityBit) != 0; +} + /* This is used for asserts that check that inline cache editing results in valid addresses. In the C VM interpret is presumed to come before any primitives and so it @@ -20428,13 +20446,17 @@ goto l1; } l1: /* end lengthOf: */; - if ((lastIndex - startIP) > 100) { - lastIndex = startIP + 100; + if ((lastIndex - startIP) > 104) { + lastIndex = startIP + 103; } bytecodesPerLine = 8; for (index = startIP; index <= lastIndex; index += 1) { byte = byteAt((oop + BaseHeaderSize) + (index - 1)); printf(" %02x/%-3d", byte,byte); + if ((index == lastIndex) + && ((lengthOf(oop)) > index)) { + print("..."); + } if ((((index - startIP) + 1) % bytecodesPerLine) == 0) { /* begin cr */ printf("\n"); @@ -38294,7 +38316,7 @@ void printContext(sqInt aContext) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt ip; void *p; @@ -38345,17 +38367,22 @@ print("sender "); shortPrintOop(sender); print("ip "); - printNum(ip); - print(" ("); - printNum((ip >> 1)); - /* begin space */ - /* begin printChar: */ - putchar(' '); - printHex((ip >> 1)); - /* begin printChar: */ - putchar(')'); - /* begin cr */ - printf("\n"); + if (ip == GIV(nilObj)) { + shortPrintOop(ip); + } + else { + printNum(ip); + print(" ("); + printNum((ip >> 1)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex((ip >> 1)); + /* begin printChar: */ + putchar(')'); + /* begin cr */ + printf("\n"); + } } sp = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); sp = ((sp < ((lengthOf(aContext)) - ReceiverIndex)) ? sp : ((lengthOf(aContext)) - ReceiverIndex)); @@ -41910,6 +41937,7 @@ shortPrintContext(sqInt aContext) { sqInt home; + char *theFP; if (!(((aContext & 1) == 0) && (((((usqInt) (longAt(aContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -41920,14 +41948,20 @@ return; } home = findHomeForContext(aContext); - printNum(aContext); + printHex(aContext); if (((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { - if ((checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) - && (isMachineCodeFrame(frameOfMarriedContext(aContext)))) { - print(" m "); + if (checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) { + if (isMachineCodeFrame((theFP = frameOfMarriedContext(aContext)))) { + print(" M ("); + } + else { + print(" I ("); + } + printHex(theFP); + print(") "); } else { - print(" i "); + print(" w "); } } else { @@ -42002,7 +42036,7 @@ void shortPrintFrameAndNCallers(char *theFP, sqInt n) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if ((n > 0) + if ((n != 0) && ((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { shortPrintFrame(theFP); @@ -45647,6 +45681,7 @@ {"", "callbackEnter", (void*)callbackEnter}, {"", "callbackLeave", (void*)callbackLeave}, {"", "dumpImage", (void*)dumpImage}, + {"", "internalIsImmutable", (void*)internalIsImmutable}, {"", "moduleUnloaded", (void*)moduleUnloaded}, {"", "primitiveAddLargeIntegers", (void*)primitiveAddLargeIntegers}, {"", "primitiveBitAndLargeIntegers", (void*)primitiveBitAndLargeIntegers}, Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/nscogsrc/vm/interp.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Nov 9 11:39:06 PST 2011 + Thu Nov 17 17:17:12 PST 2011 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/cogit.c 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba + CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d from - StackToRegisterMappingCogit VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba + StackToRegisterMappingCogit VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -798,6 +798,7 @@ sqInt isSendReturnPC(sqInt retpc); static sqInt isSmallIntegerTagNonZero(void); static sqInt isUnconditionalBranch(BytecodeDescriptor * self_in_isUnconditionalBranch); +static sqInt isValidFramelessRegister(sqInt reg); static AbstractInstruction * gJumpFPEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreaterOrEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreater(void *jumpTarget); @@ -951,6 +952,7 @@ static void ssFlushTo(sqInt index); static void ssFlushUpThroughReceiverVariable(sqInt slotIndex); static void ssFlushUpThroughTemporaryVariable(sqInt tempIndex); +static void ssPopSpillsFrom(sqInt index); static void ssPop(sqInt n); static sqInt ssPushAnnotatedConstant(sqInt literal); static sqInt ssPushBaseoffset(sqInt reg, sqInt offset); @@ -12281,6 +12283,7 @@ genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } else { + ssPopSpillsFrom(methodOrBlockNumArgs - 1); /* begin RetN: */ offset = ((methodOrBlockNumArgs > (numRegArgs())) || (regArgsHaveBeenPushed) @@ -13042,6 +13045,16 @@ } +/* Answer if the receiver is valid in a frameless method. */ + +static sqInt +isValidFramelessRegister(sqInt reg) +{ + return (reg == ReceiverResultReg) + || (reg == Arg0Reg); +} + + /* Floating-point jumps are a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -16054,7 +16067,10 @@ } if (simSpillBase <= index) { for (i = (((simSpillBase < 0) ? 0 : simSpillBase)); i <= index; i += 1) { - assert(needsFrame); + assert(needsFrame + || (((((simStackAt(i)->type)) == SSBaseOffset) + || (((simStackAt(i)->type)) == SSRegister)) + && (isValidFramelessRegister((simStackAt(i)->registerr))))); ensureSpilledAtfrom(simStackAt(i), frameOffsetOfTemporary(i), FPReg); } simSpillBase = index + 1; @@ -16103,7 +16119,24 @@ } } + +/* Pop any spilled items on the sim stack from index, used to balance the + stack on return. + */ + static void +ssPopSpillsFrom(sqInt index) +{ + sqInt i; + + for (i = index; i <= simStackPtr; i += 1) { + if ((simStackAt(i)->spilled)) { + popToReg(ssTop(), TempReg); + } + } +} + +static void ssPop(sqInt n) { assert(((simStackPtr - n) >= (methodOrBlockNumTemps - 1)) Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/cogit.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba + CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/cogmethod.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba + CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/cointerp.c 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d from - CoInterpreter VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CoInterpreter VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -327,6 +327,7 @@ sqInt interpret(void); static void activateCoggedNewMethod(sqInt inInterpreter); static void activateNewMethod(void); +sqInt activeProcess(void); EXPORT(sqInt) addGCRoot(sqInt *varLoc); static void addLastLinktoList(sqInt proc, sqInt aList); static void addNewMethodToCache(sqInt class); @@ -1889,7 +1890,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.137]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.138]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -8684,6 +8685,16 @@ } +/* Answer the current activeProcess. */ +/* useful for VM debugging */ + +sqInt +activeProcess(void) +{ + return longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); +} + + /* Add the given variable location to the extra roots table */ EXPORT(sqInt) @@ -19755,13 +19766,17 @@ goto l1; } l1: /* end lengthOf: */; - if ((lastIndex - startIP) > 100) { - lastIndex = startIP + 100; + if ((lastIndex - startIP) > 104) { + lastIndex = startIP + 103; } bytecodesPerLine = 8; for (index = startIP; index <= lastIndex; index += 1) { byte = byteAt((oop + BaseHeaderSize) + (index - 1)); printf(" %02x/%-3d", byte,byte); + if ((index == lastIndex) + && ((lengthOf(oop)) > index)) { + print("..."); + } if ((((index - startIP) + 1) % bytecodesPerLine) == 0) { /* begin cr */ printf("\n"); @@ -37608,7 +37623,7 @@ void printContext(sqInt aContext) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt ip; void *p; @@ -37659,17 +37674,22 @@ print("sender "); shortPrintOop(sender); print("ip "); - printNum(ip); - print(" ("); - printNum((ip >> 1)); - /* begin space */ - /* begin printChar: */ - putchar(' '); - printHex((ip >> 1)); - /* begin printChar: */ - putchar(')'); - /* begin cr */ - printf("\n"); + if (ip == GIV(nilObj)) { + shortPrintOop(ip); + } + else { + printNum(ip); + print(" ("); + printNum((ip >> 1)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex((ip >> 1)); + /* begin printChar: */ + putchar(')'); + /* begin cr */ + printf("\n"); + } } sp = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); sp = ((sp < ((lengthOf(aContext)) - ReceiverIndex)) ? sp : ((lengthOf(aContext)) - ReceiverIndex)); @@ -41224,6 +41244,7 @@ shortPrintContext(sqInt aContext) { sqInt home; + char *theFP; if (!(((aContext & 1) == 0) && (((((usqInt) (longAt(aContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -41234,14 +41255,20 @@ return; } home = findHomeForContext(aContext); - printNum(aContext); + printHex(aContext); if (((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { - if ((checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) - && (isMachineCodeFrame(frameOfMarriedContext(aContext)))) { - print(" m "); + if (checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) { + if (isMachineCodeFrame((theFP = frameOfMarriedContext(aContext)))) { + print(" M ("); + } + else { + print(" I ("); + } + printHex(theFP); + print(") "); } else { - print(" i "); + print(" w "); } } else { @@ -41316,7 +41343,7 @@ void shortPrintFrameAndNCallers(char *theFP, sqInt n) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if ((n > 0) + if ((n != 0) && ((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { shortPrintFrame(theFP); Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/cointerp.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,9 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ /*** Function Prototypes ***/ +sqInt activeProcess(void); sqInt addressCouldBeObj(sqInt address); sqInt addressCouldBeOop(sqInt address); usqInt argumentCountAddress(void); Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/cointerpmt.c 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d from - CoInterpreterMT VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CoInterpreterMT VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -370,7 +370,7 @@ sqInt interpret(void); static void activateCoggedNewMethod(sqInt inInterpreter); static void activateNewMethod(void); -static sqInt activeProcess(void); +sqInt activeProcess(void); EXPORT(sqInt) addGCRoot(sqInt *varLoc); static void addLastLinktoList(sqInt proc, sqInt aList); static void addNewMethodToCache(sqInt class); @@ -1989,7 +1989,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.137]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.138]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -8787,8 +8787,9 @@ /* Answer the current activeProcess. */ +/* useful for VM debugging */ -static sqInt +sqInt activeProcess(void) { return longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); @@ -20488,13 +20489,17 @@ goto l1; } l1: /* end lengthOf: */; - if ((lastIndex - startIP) > 100) { - lastIndex = startIP + 100; + if ((lastIndex - startIP) > 104) { + lastIndex = startIP + 103; } bytecodesPerLine = 8; for (index = startIP; index <= lastIndex; index += 1) { byte = byteAt((oop + BaseHeaderSize) + (index - 1)); printf(" %02x/%-3d", byte,byte); + if ((index == lastIndex) + && ((lengthOf(oop)) > index)) { + print("..."); + } if ((((index - startIP) + 1) % bytecodesPerLine) == 0) { /* begin cr */ printf("\n"); @@ -38935,7 +38940,7 @@ void printContext(sqInt aContext) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt ip; void *p; @@ -38986,17 +38991,22 @@ print("sender "); shortPrintOop(sender); print("ip "); - printNum(ip); - print(" ("); - printNum((ip >> 1)); - /* begin space */ - /* begin printChar: */ - putchar(' '); - printHex((ip >> 1)); - /* begin printChar: */ - putchar(')'); - /* begin cr */ - printf("\n"); + if (ip == GIV(nilObj)) { + shortPrintOop(ip); + } + else { + printNum(ip); + print(" ("); + printNum((ip >> 1)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex((ip >> 1)); + /* begin printChar: */ + putchar(')'); + /* begin cr */ + printf("\n"); + } } sp = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); sp = ((sp < ((lengthOf(aContext)) - ReceiverIndex)) ? sp : ((lengthOf(aContext)) - ReceiverIndex)); @@ -42652,6 +42662,7 @@ shortPrintContext(sqInt aContext) { sqInt home; + char *theFP; if (!(((aContext & 1) == 0) && (((((usqInt) (longAt(aContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -42662,14 +42673,20 @@ return; } home = findHomeForContext(aContext); - printNum(aContext); + printHex(aContext); if (((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { - if ((checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) - && (isMachineCodeFrame(frameOfMarriedContext(aContext)))) { - print(" m "); + if (checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) { + if (isMachineCodeFrame((theFP = frameOfMarriedContext(aContext)))) { + print(" M ("); + } + else { + print(" I ("); + } + printHex(theFP); + print(") "); } else { - print(" i "); + print(" w "); } } else { @@ -42744,7 +42761,7 @@ void shortPrintFrameAndNCallers(char *theFP, sqInt n) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if ((n > 0) + if ((n != 0) && ((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { shortPrintFrame(theFP); Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/cointerpmt.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,9 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ /*** Function Prototypes ***/ +sqInt activeProcess(void); sqInt addressCouldBeObj(sqInt address); sqInt addressCouldBeOop(sqInt address); usqInt argumentCountAddress(void); Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2011-11-18 01:18:02 UTC (rev 2514) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d from - CoInterpreter VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CoInterpreter VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -330,6 +330,7 @@ sqInt interpret(void); static void activateCoggedNewMethod(sqInt inInterpreter); static void activateNewMethod(void); +sqInt activeProcess(void); EXPORT(sqInt) addGCRoot(sqInt *varLoc); static void addLastLinktoList(sqInt proc, sqInt aList); static void addNewMethodToCache(sqInt class); @@ -1892,7 +1893,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.137]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.138]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -8688,6 +8689,16 @@ } +/* Answer the current activeProcess. */ +/* useful for VM debugging */ + +sqInt +activeProcess(void) +{ + return longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); +} + + /* Add the given variable location to the extra roots table */ EXPORT(sqInt) @@ -19759,13 +19770,17 @@ goto l1; } l1: /* end lengthOf: */; - if ((lastIndex - startIP) > 100) { - lastIndex = startIP + 100; + if ((lastIndex - startIP) > 104) { + lastIndex = startIP + 103; } bytecodesPerLine = 8; for (index = startIP; index <= lastIndex; index += 1) { byte = byteAt((oop + BaseHeaderSize) + (index - 1)); printf(" %02x/%-3d", byte,byte); + if ((index == lastIndex) + && ((lengthOf(oop)) > index)) { + print("..."); + } if ((((index - startIP) + 1) % bytecodesPerLine) == 0) { /* begin cr */ printf("\n"); @@ -37612,7 +37627,7 @@ void printContext(sqInt aContext) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt ip; void *p; @@ -37663,17 +37678,22 @@ print("sender "); shortPrintOop(sender); print("ip "); - printNum(ip); - print(" ("); - printNum((ip >> 1)); - /* begin space */ - /* begin printChar: */ - putchar(' '); - printHex((ip >> 1)); - /* begin printChar: */ - putchar(')'); - /* begin cr */ - printf("\n"); + if (ip == GIV(nilObj)) { + shortPrintOop(ip); + } + else { + printNum(ip); + print(" ("); + printNum((ip >> 1)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex((ip >> 1)); + /* begin printChar: */ + putchar(')'); + /* begin cr */ + printf("\n"); + } } sp = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); sp = ((sp < ((lengthOf(aContext)) - ReceiverIndex)) ? sp : ((lengthOf(aContext)) - ReceiverIndex)); @@ -41228,6 +41248,7 @@ shortPrintContext(sqInt aContext) { sqInt home; + char *theFP; if (!(((aContext & 1) == 0) && (((((usqInt) (longAt(aContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -41238,14 +41259,20 @@ return; } home = findHomeForContext(aContext); - printNum(aContext); + printHex(aContext); if (((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { - if ((checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) - && (isMachineCodeFrame(frameOfMarriedContext(aContext)))) { - print(" m "); + if (checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) { + if (isMachineCodeFrame((theFP = frameOfMarriedContext(aContext)))) { + print(" M ("); + } + else { + print(" I ("); + } + printHex(theFP); + print(") "); } else { - print(" i "); + print(" w "); } } else { @@ -41320,7 +41347,7 @@ void shortPrintFrameAndNCallers(char *theFP, sqInt n) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if ((n > 0) + if ((n != 0) && ((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { shortPrintFrame(theFP); Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-11-18 01:18:02 UTC (rev 2514) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d from - CoInterpreterMT VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CoInterpreterMT VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -373,7 +373,7 @@ sqInt interpret(void); static void activateCoggedNewMethod(sqInt inInterpreter); static void activateNewMethod(void); -static sqInt activeProcess(void); +sqInt activeProcess(void); EXPORT(sqInt) addGCRoot(sqInt *varLoc); static void addLastLinktoList(sqInt proc, sqInt aList); static void addNewMethodToCache(sqInt class); @@ -1992,7 +1992,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.137]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.138]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -8791,8 +8791,9 @@ /* Answer the current activeProcess. */ +/* useful for VM debugging */ -static sqInt +sqInt activeProcess(void) { return longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); @@ -20492,13 +20493,17 @@ goto l1; } l1: /* end lengthOf: */; - if ((lastIndex - startIP) > 100) { - lastIndex = startIP + 100; + if ((lastIndex - startIP) > 104) { + lastIndex = startIP + 103; } bytecodesPerLine = 8; for (index = startIP; index <= lastIndex; index += 1) { byte = byteAt((oop + BaseHeaderSize) + (index - 1)); printf(" %02x/%-3d", byte,byte); + if ((index == lastIndex) + && ((lengthOf(oop)) > index)) { + print("..."); + } if ((((index - startIP) + 1) % bytecodesPerLine) == 0) { /* begin cr */ printf("\n"); @@ -38939,7 +38944,7 @@ void printContext(sqInt aContext) -{ +{ DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt ip; void *p; @@ -38990,17 +38995,22 @@ print("sender "); shortPrintOop(sender); print("ip "); - printNum(ip); - print(" ("); - printNum((ip >> 1)); - /* begin space */ - /* begin printChar: */ - putchar(' '); - printHex((ip >> 1)); - /* begin printChar: */ - putchar(')'); - /* begin cr */ - printf("\n"); + if (ip == GIV(nilObj)) { + shortPrintOop(ip); + } + else { + printNum(ip); + print(" ("); + printNum((ip >> 1)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex((ip >> 1)); + /* begin printChar: */ + putchar(')'); + /* begin cr */ + printf("\n"); + } } sp = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); sp = ((sp < ((lengthOf(aContext)) - ReceiverIndex)) ? sp : ((lengthOf(aContext)) - ReceiverIndex)); @@ -42656,6 +42666,7 @@ shortPrintContext(sqInt aContext) { sqInt home; + char *theFP; if (!(((aContext & 1) == 0) && (((((usqInt) (longAt(aContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -42666,14 +42677,20 @@ return; } home = findHomeForContext(aContext); - printNum(aContext); + printHex(aContext); if (((longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { - if ((checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) - && (isMachineCodeFrame(frameOfMarriedContext(aContext)))) { - print(" m "); + if (checkIsStillMarriedContextcurrentFP(aContext, GIV(framePointer))) { + if (isMachineCodeFrame((theFP = frameOfMarriedContext(aContext)))) { + print(" M ("); + } + else { + print(" I ("); + } + printHex(theFP); + print(") "); } else { - print(" i "); + print(" w "); } } else { @@ -42748,7 +42765,7 @@ void shortPrintFrameAndNCallers(char *theFP, sqInt n) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if ((n > 0) + if ((n != 0) && ((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { shortPrintFrame(theFP); Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/interp.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2011-11-15 00:39:49 UTC (rev 2513) +++ branches/Cog/src/vm/vmCallback.h 2011-11-18 01:18:02 UTC (rev 2514) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.137 uuid: fbe64d98-6b1a-4c5b-b3f3-d2b1091406dc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d */ #define VM_CALLBACK_INC 1

2 1

moving cocoa-cog integration to blessed
by Esteban Lorenzano 18 Nov '11

18 Nov '11

Hi, Since nobody complained (and for me is working fine), I will move my integration to blessed branch. That means it will be a unix and a windows build (and that can derive in more errors, obviously) please, any observation/report will be welcome :) cheers, Esteban

2 1

Fwd: new cog blessed builds on jenkins
by Igor Stasenko 18 Nov '11

18 Nov '11

---------- Forwarded message ---------- From: Igor Stasenko <siguctua(a)gmail.com> Date: 18 November 2011 19:16 Subject: Re: new cog blessed builds on jenkins To: Esteban Lorenzano <estebanlm(a)gmail.com> On 18 November 2011 19:05, Esteban Lorenzano <estebanlm(a)gmail.com> wrote: > Hi, > > So... everything looks fine after my push to blessed. Can someone confirm that for non Cocoa Cog versions? > I would like some feedback on unix/windows versions (yeah... not my direct responsibility, but since I made the integration, maybe I mess up things). > > btw... what happened with windows jenkins builds? that never worked? Never. It worked on Hudson, but i didn't migrated jobs to jenkins yet, because jenkins was not ready for windows slaves :) There are presistent problem with windows slaves, because they shutdown/crash.. no idea what periodically. I discussed this with INRIA engineers couple days ago and hope we will get _stable_ setup soon. > > Cheers, > Esteban -- Best regards, Igor Stasenko. -- Best regards, Igor Stasenko.

1 0

[commit] r2515 - CogVM source as per VMMaker.oscog-eem.139.
by commits＠squeakvm.org 18 Nov '11

18 Nov '11

Author: eliot Date: 2011-11-18 10:13:10 -0800 (Fri, 18 Nov 2011) New Revision: 2515 Modified: branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Log: CogVM source as per VMMaker.oscog-eem.139. Replace bogus fix for frameless foo: arg instVar := instVar code gen bug (apparent failure to pop spills on frameless return), with correct fix, which is not to flush the top of stack when pop/storing receiver and/or temp vars. i.e. ssFlushUpThroughReceiverVariable: & ssFlushUpThroughTemporaryVariable: skip the entry at simStackPtr. Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2011-11-18 01:18:02 UTC (rev 2514) +++ branches/Cog/nscogsrc/vm/cogit.c 2011-11-18 18:13:10 UTC (rev 2515) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d + CCodeGenerator VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 from - StackToRegisterMappingCogit VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d + StackToRegisterMappingCogit VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -805,7 +805,6 @@ sqInt isSendReturnPC(sqInt retpc); static sqInt isSmallIntegerTagNonZero(void); static sqInt isUnconditionalBranch(BytecodeDescriptor * self_in_isUnconditionalBranch); -static sqInt isValidFramelessRegister(sqInt reg); static AbstractInstruction * gJumpFPEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreaterOrEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreater(void *jumpTarget); @@ -964,7 +963,6 @@ static void ssFlushTo(sqInt index); static void ssFlushUpThroughReceiverVariable(sqInt slotIndex); static void ssFlushUpThroughTemporaryVariable(sqInt tempIndex); -static void ssPopSpillsFrom(sqInt index); static void ssPop(sqInt n); static sqInt ssPushAnnotatedConstant(sqInt literal); static sqInt ssPushBaseoffset(sqInt reg, sqInt offset); @@ -12495,7 +12493,6 @@ genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } else { - ssPopSpillsFrom(methodOrBlockNumArgs - 1); /* begin RetN: */ offset = ((methodOrBlockNumArgs > (numRegArgs())) || (regArgsHaveBeenPushed) @@ -13257,16 +13254,6 @@ } -/* Answer if the receiver is valid in a frameless method. */ - -static sqInt -isValidFramelessRegister(sqInt reg) -{ - return (reg == ReceiverResultReg) - || (reg == Arg0Reg); -} - - /* Floating-point jumps are a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -16552,10 +16539,7 @@ } if (simSpillBase <= index) { for (i = (((simSpillBase < 0) ? 0 : simSpillBase)); i <= index; i += 1) { - assert(needsFrame - || (((((simStackAt(i)->type)) == SSBaseOffset) - || (((simStackAt(i)->type)) == SSRegister)) - && (isValidFramelessRegister((simStackAt(i)->registerr))))); + assert(needsFrame); ensureSpilledAtfrom(simStackAt(i), frameOffsetOfTemporary(i), FPReg); } simSpillBase = index + 1; @@ -16563,8 +16547,9 @@ } -/* Any occurrences on the stack of the value being stored must - be flushed, and hence any values colder than them stack. */ +/* Any occurrences on the stack of the value being stored (which is the top + of stack) + must be flushed, and hence any values colder than them stack. */ static void ssFlushUpThroughReceiverVariable(sqInt slotIndex) @@ -16572,7 +16557,7 @@ CogSimStackEntry *desc; sqInt index; - for (index = simStackPtr; index >= (((simSpillBase < 0) ? 0 : simSpillBase)); index += -1) { + for (index = (simStackPtr - 1); index >= (((simSpillBase < 0) ? 0 : simSpillBase)); index += -1) { desc = simStackAt(index); if ((((desc->type)) == SSBaseOffset) && ((((desc->registerr)) == ReceiverResultReg) @@ -16584,8 +16569,9 @@ } -/* Any occurrences on the stack of the value being stored must - be flushed, and hence any values colder than them stack. */ +/* Any occurrences on the stack of the value being stored (which is the top + of stack) + must be flushed, and hence any values colder than them stack. */ static void ssFlushUpThroughTemporaryVariable(sqInt tempIndex) @@ -16593,7 +16579,7 @@ CogSimStackEntry *desc; sqInt index; - for (index = simStackPtr; index >= simSpillBase; index += -1) { + for (index = (simStackPtr - 1); index >= simSpillBase; index += -1) { desc = simStackAt(index); if ((((desc->type)) == SSBaseOffset) && ((((desc->registerr)) == FPReg) @@ -16604,24 +16590,7 @@ } } - -/* Pop any spilled items on the sim stack from index, used to balance the - stack on return. - */ - static void -ssPopSpillsFrom(sqInt index) -{ - sqInt i; - - for (i = index; i <= simStackPtr; i += 1) { - if ((simStackAt(i)->spilled)) { - popToReg(ssTop(), TempReg); - } - } -} - -static void ssPop(sqInt n) { assert(((simStackPtr - n) >= (methodOrBlockNumTemps - 1)) Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2011-11-18 01:18:02 UTC (rev 2514) +++ branches/Cog/nscogsrc/vm/cogit.h 2011-11-18 18:13:10 UTC (rev 2515) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d + CCodeGenerator VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2011-11-18 01:18:02 UTC (rev 2514) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2011-11-18 18:13:10 UTC (rev 2515) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d + CCodeGenerator VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Nov 17 17:17:12 PST 2011 + Fri Nov 18 10:11:32 PST 2011 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2011-11-18 01:18:02 UTC (rev 2514) +++ branches/Cog/src/vm/cogit.c 2011-11-18 18:13:10 UTC (rev 2515) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d + CCodeGenerator VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 from - StackToRegisterMappingCogit VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d + StackToRegisterMappingCogit VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -798,7 +798,6 @@ sqInt isSendReturnPC(sqInt retpc); static sqInt isSmallIntegerTagNonZero(void); static sqInt isUnconditionalBranch(BytecodeDescriptor * self_in_isUnconditionalBranch); -static sqInt isValidFramelessRegister(sqInt reg); static AbstractInstruction * gJumpFPEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreaterOrEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreater(void *jumpTarget); @@ -952,7 +951,6 @@ static void ssFlushTo(sqInt index); static void ssFlushUpThroughReceiverVariable(sqInt slotIndex); static void ssFlushUpThroughTemporaryVariable(sqInt tempIndex); -static void ssPopSpillsFrom(sqInt index); static void ssPop(sqInt n); static sqInt ssPushAnnotatedConstant(sqInt literal); static sqInt ssPushBaseoffset(sqInt reg, sqInt offset); @@ -12283,7 +12281,6 @@ genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); } else { - ssPopSpillsFrom(methodOrBlockNumArgs - 1); /* begin RetN: */ offset = ((methodOrBlockNumArgs > (numRegArgs())) || (regArgsHaveBeenPushed) @@ -13045,16 +13042,6 @@ } -/* Answer if the receiver is valid in a frameless method. */ - -static sqInt -isValidFramelessRegister(sqInt reg) -{ - return (reg == ReceiverResultReg) - || (reg == Arg0Reg); -} - - /* Floating-point jumps are a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -16067,10 +16054,7 @@ } if (simSpillBase <= index) { for (i = (((simSpillBase < 0) ? 0 : simSpillBase)); i <= index; i += 1) { - assert(needsFrame - || (((((simStackAt(i)->type)) == SSBaseOffset) - || (((simStackAt(i)->type)) == SSRegister)) - && (isValidFramelessRegister((simStackAt(i)->registerr))))); + assert(needsFrame); ensureSpilledAtfrom(simStackAt(i), frameOffsetOfTemporary(i), FPReg); } simSpillBase = index + 1; @@ -16078,8 +16062,9 @@ } -/* Any occurrences on the stack of the value being stored must - be flushed, and hence any values colder than them stack. */ +/* Any occurrences on the stack of the value being stored (which is the top + of stack) + must be flushed, and hence any values colder than them stack. */ static void ssFlushUpThroughReceiverVariable(sqInt slotIndex) @@ -16087,7 +16072,7 @@ CogSimStackEntry *desc; sqInt index; - for (index = simStackPtr; index >= (((simSpillBase < 0) ? 0 : simSpillBase)); index += -1) { + for (index = (simStackPtr - 1); index >= (((simSpillBase < 0) ? 0 : simSpillBase)); index += -1) { desc = simStackAt(index); if ((((desc->type)) == SSBaseOffset) && ((((desc->registerr)) == ReceiverResultReg) @@ -16099,8 +16084,9 @@ } -/* Any occurrences on the stack of the value being stored must - be flushed, and hence any values colder than them stack. */ +/* Any occurrences on the stack of the value being stored (which is the top + of stack) + must be flushed, and hence any values colder than them stack. */ static void ssFlushUpThroughTemporaryVariable(sqInt tempIndex) @@ -16108,7 +16094,7 @@ CogSimStackEntry *desc; sqInt index; - for (index = simStackPtr; index >= simSpillBase; index += -1) { + for (index = (simStackPtr - 1); index >= simSpillBase; index += -1) { desc = simStackAt(index); if ((((desc->type)) == SSBaseOffset) && ((((desc->registerr)) == FPReg) @@ -16119,24 +16105,7 @@ } } - -/* Pop any spilled items on the sim stack from index, used to balance the - stack on return. - */ - static void -ssPopSpillsFrom(sqInt index) -{ - sqInt i; - - for (i = index; i <= simStackPtr; i += 1) { - if ((simStackAt(i)->spilled)) { - popToReg(ssTop(), TempReg); - } - } -} - -static void ssPop(sqInt n) { assert(((simStackPtr - n) >= (methodOrBlockNumTemps - 1)) Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2011-11-18 01:18:02 UTC (rev 2514) +++ branches/Cog/src/vm/cogit.h 2011-11-18 18:13:10 UTC (rev 2515) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d + CCodeGenerator VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2011-11-18 01:18:02 UTC (rev 2514) +++ branches/Cog/src/vm/cogmethod.h 2011-11-18 18:13:10 UTC (rev 2515) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.138 uuid: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d + CCodeGenerator VMMaker.oscog-eem.139 uuid: c2849383-9768-4948-b9b2-a5c22d482b07 */ typedef struct {

1 0

new cog blessed builds on jenkins
by Esteban Lorenzano 18 Nov '11

18 Nov '11

Hi, So... everything looks fine after my push to blessed. Can someone confirm that for non Cocoa Cog versions? I would like some feedback on unix/windows versions (yeah... not my direct responsibility, but since I made the integration, maybe I mess up things). btw... what happened with windows jenkins builds? that never worked? Cheers, Esteban

1 0

VM Maker: VMMaker.oscog-eem.139.mcz
by commits＠source.squeak.org 18 Nov '11

18 Nov '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.139.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.139 Author: eem Time: 18 November 2011, 9:38:13.812 am UUID: c2849383-9768-4948-b9b2-a5c22d482b07 Ancestors: VMMaker.oscog-eem.138 Replace bogus fix for frameless foo: arg instVar := instVar code gen bug (apparent failure to pop spills on frameless return), with correct fix, which is not to flush the top of stack when pop/storing receiver and/or temp vars. i.e. ssFlushUpThroughReceiverVariable: & ssFlushUpThroughTemporaryVariable: skip the entry at simStackPtr. =============== Diff against VMMaker.oscog-eem.138 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genUpArrowReturn (in category 'bytecode generators') ----- genUpArrowReturn "Generate a method return from within a method or a block. Frameless method activation looks like receiver args sp-> ret pc. Return pops receiver and arguments off the stack. Callee pushes the result." inBlock ifTrue: [self assert: needsFrame. self annotateBytecode: (self CallRT: ceNonLocalReturnTrampoline). ^0]. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord] ifFalse: + [self RetN: ((methodOrBlockNumArgs > self numRegArgs - [self ssPopSpillsFrom: methodOrBlockNumArgs - 1. - self RetN: ((methodOrBlockNumArgs > self numRegArgs "A method with an interpreter prim will push its register args for the prim. If the failure body is frameless the args must still be popped, see e.g. Behavior>>nextInstance." or: [regArgsHaveBeenPushed]) ifTrue: [methodOrBlockNumArgs + 1 * BytesPerWord] ifFalse: [0])]. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>ssFlushTo: (in category 'simulation stack') ----- ssFlushTo: index methodOrBlockNumTemps to: simSpillBase - 1 do: [:i| self assert: (self simStackAt: i) spilled]. simSpillBase <= index ifTrue: [(simSpillBase max: 0) to: index do: [:i| + self assert: needsFrame. - self assert: (needsFrame - or: [((self simStackAt: i) type = SSBaseOffset - or: [(self simStackAt: i) type = SSRegister]) - and: [self isValidFramelessRegister: (self simStackAt: i) register]]). (self simStackAt: i) ensureSpilledAt: (self frameOffsetOfTemporary: i) from: FPReg]. simSpillBase := index + 1]! Item was changed: ----- Method: StackToRegisterMappingCogit>>ssFlushUpThroughReceiverVariable: (in category 'simulation stack') ----- ssFlushUpThroughReceiverVariable: slotIndex + "Any occurrences on the stack of the value being stored (which is the top of stack) + must be flushed, and hence any values colder than them stack." - "Any occurrences on the stack of the value being stored must - be flushed, and hence any values colder than them stack." <var: #desc type: #'CogSimStackEntry *'> + simStackPtr - 1 to: (simSpillBase max: 0) by: -1 do: - simStackPtr to: (simSpillBase max: 0) by: -1 do: [:index| | desc | desc := self simStackAt: index. (desc type = SSBaseOffset and: [desc register = ReceiverResultReg and: [desc offset = (objectRepresentation slotOffsetOfInstVarIndex: slotIndex)]]) ifTrue: [self ssFlushTo: index. ^self]]! Item was changed: ----- Method: StackToRegisterMappingCogit>>ssFlushUpThroughTemporaryVariable: (in category 'simulation stack') ----- ssFlushUpThroughTemporaryVariable: tempIndex + "Any occurrences on the stack of the value being stored (which is the top of stack) + must be flushed, and hence any values colder than them stack." - "Any occurrences on the stack of the value being stored must - be flushed, and hence any values colder than them stack." <var: #desc type: #'CogSimStackEntry *'> + simStackPtr - 1 to: simSpillBase by: -1 do: - simStackPtr to: simSpillBase by: -1 do: [:index| | desc | desc := self simStackAt: index. (desc type = SSBaseOffset and: [desc register = FPReg and: [desc offset = (self frameOffsetOfTemporary: tempIndex)]]) ifTrue: [self ssFlushTo: index. ^self]]! Item was removed: - ----- Method: StackToRegisterMappingCogit>>ssPopSpillsFrom: (in category 'simulation stack') ----- - ssPopSpillsFrom: index - "Pop any spilled items on the sim stack from index, used to balance the stack on return." - index to: simStackPtr do: - [:i| - (self simStackAt: i) spilled ifTrue: - [self ssTop popToReg: TempReg]]!

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.33.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 18 Nov '11

18 Nov '11

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.33 Author: eem Time: 17 November 2011, 3:48:08 am UUID: 3c8b9706-e5ad-4eb4-85a3-a82fd91005a0 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.32 Some limited simulation support for the OSProcessPlugin. Sufficient for a Newspeak image to start-up.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2011