Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

VM Maker: VMMaker.oscog-EstebanLorenzano.1692.mcz
by commits＠source.squeak.org 22 Feb '16

22 Feb '16

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1692.mcz ==================== Summary ==================== Name: VMMaker.oscog-EstebanLorenzano.1692 Author: EstebanLorenzano Time: 22 February 2016, 5:33:10.466006 pm UUID: 37109e31-1d50-4726-a9ac-b2a7d08c387e Ancestors: VMMaker.oscog-tfel.1691 remove (again) unused method... if I do not remove this compilation for Pharo fails. =============== Diff against VMMaker.oscog-tfel.1691 =============== Item was removed: - ----- Method: ThreadedIA32FFIPlugin class>>moduleName (in category 'translation') ----- - moduleName - ^'IA32FFIPlugin'!

1 0

#ifCurtailed: multi-thread semantics
by Ben Coman 22 Feb '16

22 Feb '16

Just a curiousity. I learnt something new today... #ifCurtailed blocks are processed in the outer most thread. Transcript clear; crShow: Processor activeProcess; show:' - outside'. p1 := [ [ Transcript crShow: Processor activeProcess; show: ' - inside'. 1 second wait. ] ifCurtailed: [ Transcript crShow: Processor activeProcess; show: ' - curtailed' . ] ] newProcess priority: 41. p1 resume. p1 terminate. ==> a Process(304957184) in nil - outside a Process(680396800) in nil - inside a Process(304957184) in nil - curtailed This makes some sense since (I guess) the inside thread is terminated before the curtailed block executes. However another curiousity... Transcript clear; crShow: Processor activeProcess; show:' - outside'. p1 := [ Transcript crShow: Processor activeProcess; show: ' - middle'. p2 := [ [ Transcript crShow: Processor activeProcess; show: ' - inside'. 1 second wait. ] ifCurtailed: [ Transcript crShow: Processor activeProcess; show: ' - curtailed' . 2 seconds wait ] ] fork. 3 second wait. ] newProcess priority: 41. p1 resume. p2 terminate. ==> a Process(304957184) in nil - outside a Process(146580480) in nil - middle a Process(417340928) in nil - inside a Process(304957184) in nil - curtailed ...why does the curtailed block execute in outside thread rather than the middle thread which still exists? Also interesting is that if the curtailed code contains a wait, it blocks the whole UI. cheers -ben btw, I added... Process>>printOn: aStream super printOn: aStream. aStream nextPutAll: '(' , self hash printString , ') in '. suspendedContext printOn: aStream

2 2

VM debugging - process IDs (was Re: [Vm-dev] Re: slang printf equivalent)
by Ben Coman 22 Feb '16

22 Feb '16

@Esteban, thanks, that worked. @Alain, This is not for the Xen stuff. Nice to see your enthusiasm thought. I'll ping you when I have anything at all interesting with that. What I'm doing now is good practice for that. I'm working on the new primitives for Dennis' OwnedLock (basically a copy of Eliot's critical section code with modified return value semantics), but I'm doing an experiment making the lock release stricter, i.e. that only the owner can release, and hit an interesting snag where the activeProcess seen by the primitive seems different than the process that called the primitive. I'll ask some advise on that separately once I got me head around it a bit more. @Eliot, I found all those print methods and how to call them from gdb. Very cool. Now when I do... (gdb) break break primitiveOwnedLockStrictRelease (gdb) run ../50594/50594.image Execute the test method, which breaks out to gdb, then... (gdb) call printAllStacks() I get... Process 0xb1a6678 priority 40 0xbfff4098 I OwnedLock>release 0x8779700: a(n) OwnedLock processes at priority 10 Process 0xb93daa8 priority 10 0xbff650a0 M ProcessorScheduler class>idleProcess 0x8ccedd0: a(n) ProcessorScheduler class suspended processes Process 0xb93d040 priority 50 0xbff620a0 M WeakArray class>finalizationProcess 0x8ccefc0: a(n) WeakArray class Process 0xad2c848 priority 80 0xbff640e0 M DelayExperimentalSpinScheduler(DelayMicrosecondScheduler)>runTimerEventLoop 0xa0a3760: a(n) DelayExperimentalSpinScheduler Process 0xb4335e0 priority 60 0xad8eb50 s SmalltalkImage>lowSpaceWatcher Process 0xb93d748 priority 60 0xbff6107c M InputEventFetcher>waitForInput 0x9261618: a(n) InputEventFetcher cool ! So I factored the first few lines of printAllStacks out to... printActiveProcess <api> | proc | <inline: false> proc := self activeProcess. self printNameOfClass: (objectMemory fetchClassOf: proc) count: 5; space; printHex: proc. self print: ' priority '; printNum: (self quickFetchInteger: PriorityIndex ofObject: proc); cr. (not that I know the significance of <api> and <inline:false> , but monkey-see-monkey-do seems effective so far) So now I can do... (gdb) call printActiveProcess() Process 0xb1a6678 priority 40 double cool !! but how can I match up that process ID with the one shown in-Image by Process Watcher without calling printAllStacks() each time? cheers -ben On Mon, Feb 22, 2016 at 12:28 AM, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > > Hi Ben, > > you'll see a lot of print methods in StackInterpreter that dump stack frames etc. these are built above some simple string and number of output routines, like print: & printNum: that you can use in simulated code and print to stdout in the real VM also. > > For debug logging during simulation the interpreter simulators respond to #transcript by answering the output window in the VM simulation. There's a menu pick in the bottom right inspector to toggle the transcript between the small one in the VM simulation and the system's Transcript. > > _,,,^..^,,,_ (phone) > >> On Feb 21, 2016, at 6:43 AM, Alain Rastoul <alf.mmm.cat(a)gmail.com> wrote: >> >>> On 21/02/2016 14:34, Ben Coman wrote: >>> >>> The most promising I found so far is... >>> self printStringOf: 'BLAH3' ; flush. >>> but nothing show up on the bash console that started the VM. >> Hi Ben, >> >> On a standard linux console, printf should output to console (I just verified now) . >> >> What kind of console ? >> xen console for rump vm (on netbsd?) ? >> oh my ! great >> :) >> >> if so, it depends of the kind of virtualization you choosed : >> hw, I guess depends of bios and drivers (bochs/qemu should go out to qemu drivers/console?) >> pv there is a special hypercall api in mini-os to output to host domain console (don't remember exactly, may be search for printk in Mini-os/xen headers, I'll digg into and post you what I found soon). >> >> (nb: If you are at that point I am *very* interested, I struggled a lot to link a hacked vm with netbsd libs .. I am bad at autoconf, cmake and co. currently in my standby list, I will resume ) >> >> HTH >> >> regards >> >> Alain >> >>

1 2

VM Maker: VMMaker.oscog-tfel.1691.mcz
by commits＠source.squeak.org 22 Feb '16

22 Feb '16

Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tfel.1691.mcz ==================== Summary ==================== Name: VMMaker.oscog-tfel.1691 Author: tfel Time: 22 February 2016, 10:13:26.026346 am UUID: cb86b38a-7db8-484c-9407-70223d2da428 Ancestors: VMMaker.oscog-eem.1690 - call super in BitBltSimulator>>halftoneAt: - implement asInteger on CObjectAccessor, so simulation code works - fix InterpreterPrimitives>>primitiveUtcWithOffset to work in Simulator - add a test case to run the full simulation for a few million bytecodes =============== Diff against VMMaker.oscog-eem.1690 =============== Item was changed: ----- Method: BitBltSimulator>>halftoneAt: (in category 'memory access') ----- halftoneAt: idx ^self cCode: [(halftoneBase + (idx \\ halftoneHeight * 4)) long32At: 0] + inSmalltalk: [super halftoneAt: idx]! - inSmalltalk: [self long32At: halftoneBase + (idx \\ halftoneHeight * 4)]! Item was added: + ----- Method: CObjectAccessor>>asInteger (in category 'converting') ----- + asInteger + + ^ self! Item was added: + TestCase subclass: #FullSimulationTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Tests'! Item was added: + ----- Method: FullSimulationTest>>testSimulate2MillionBytecodes (in category 'as yet unclassified') ----- + testSimulate2MillionBytecodes + <timeout: 120> + | vm om | + vm := StackInterpreterSimulator newWithOptions: #(#ObjectMemory #Spur32BitMemoryManager ). + om := vm objectMemory. + vm desiredNumStackPages: 8. "Makes simulation faster by creating fewer stack pages." + vm openOn: Smalltalk imageName. + vm instVarNamed: 'assertVEPAES' put: false. "This makes the simulation faster by turning off some expensive asserts" + [[vm runForNBytes: 1500000] + on: Halt , ProvideAnswerNotification "This exception handler ignores some halts and confirmers occurring during simulation" + do: [:ex | + ex messageText == #primitiveExecuteMethodArgsArray + ifTrue: [ex resume]. + ex messageText = 'clear transcript?' + ifTrue: [ex resume: false]. + ex pass]] ensure: [Display restore].! Item was changed: ----- Method: InterpreterPrimitives>>primitiveUtcWithOffset (in category 'system control primitives') ----- primitiveUtcWithOffset "Answer an array with UTC microseconds since the Posix epoch and the current seconds offset from GMT in the local time zone. This is a named (not numbered) primitive in the null module (ie the VM)" | epochDelta offset resultArray utcMicroseconds | <export: true> <var: #epochDelta declareC: 'static usqLong epochDelta= 2177452800000000ULL'> <var: #utcMicroseconds type: #usqLong> <var: #offset type: #sqLong> + self cCode: '' inSmalltalk: [epochDelta := 2177452800000000]. utcMicroseconds := self ioUTCMicroseconds. offset := self ioLocalMicroseconds - utcMicroseconds. offset := offset / 1000000. objectMemory pushRemappableOop: (self positive64BitIntegerFor: utcMicroseconds - epochDelta). resultArray := objectMemory instantiateClass: objectMemory classArray indexableSize: 2. + objectMemory storePointer: 0 ofObject: resultArray withValue: objectMemory popRemappableOop. + objectMemory storePointerUnchecked: 1 ofObject: resultArray withValue: (objectMemory integerObjectOf: offset). - self storePointer: 0 ofObject: resultArray withValue: objectMemory popRemappableOop. - self storePointerUnchecked: 1 ofObject: resultArray withValue: (objectMemory integerObjectOf: offset). self pop: 1 thenPush: resultArray ! Item was changed: ----- Method: StackInterpreter class>>initializeClassIndices (in category 'initialization') ----- initializeClassIndices "Class Class" SuperclassIndex := 0. MethodDictionaryIndex := 1. InstanceSpecificationIndex := 2. "Fields of a message dictionary" + MethodArrayIndex := 1. - MethodArrayIndex := 1. SelectorStart := 2. "Newspeak extensions" "Fields of a Mixin (also defined by Behavior)" EnclosingMixinIndex := NewspeakVM ifTrue: [3]. "(Class instVarIndexFor: 'mixinSlot') - 1" "Fields of a MixinApplication (also defined by Behavior)" MixinIndex := NewspeakVM ifTrue: [3]. "(Class instVarIndexFor: 'mixinSlot') - 1" EnclosingObjectIndex := NewspeakVM ifTrue: [4]. "(Class instVarIndexFor: 'enclosingObjectSlot') - 1" !

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-tfel.1677.mcz
by Eliot Miranda 22 Feb '16

22 Feb '16

Hi Tim, alas this: + ----- Method: BitBltSimulator>>halftoneAt: (in category 'memory access') ----- + halftoneAt: idx + + ^ (halftoneBase + (idx \\ halftoneHeight * 4)) long32At: 0! breaks the VM simulator, my main development environment for the VM. I know you need to progress but can I ask you to test your changes against some valid simulation before committing? Here's an expression that should run the standard VM simulator and given a suitable image should run without problems: | vm om | vm := StackInterpreterSimulator newWithOptions: #(#ObjectMemory #Spur32BitMemoryManager ). om := vm objectMemory. vm desiredNumStackPages: 8. "*Makes simulation faster by creating fewer stack pages.*" vm openOn: '/Users/eliot/Cog/spurreader.image'. "*Choose any image but if you use one created by http://www.squeakvm.org/svn/squeak/branches/Cog/image/buildspurtrunkreaderi… <http://www.squeakvm.org/svn/squeak/branches/Cog/image/buildspurtrunkreaderi…> you'll be able to interact with it throguh a little dialog box that reads chunk format expressions, simulating the reader in the image that reads chunk expressions from stdin.*" vm instVarNamed: 'assertVEPAES' put: false. "*This makes the simulation faster by turning off some expensive asserts*" ^ [vm openAsMorph; halt; run] on: Halt , ProvideAnswerNotification "This exception handler i*gnores some halts and confirmers occurring during simulation*" do: [:ex | ex messageText == #primitiveExecuteMethodArgsArray ifTrue: [ex resume]. ex messageText = 'clear transcript?' ifTrue: [ex resume: false]. ex pass] Thanks! I'm about to commit a merge. I've no idea whether my change, which is: halftoneAt: idx ^self cCode: [(halftoneBase + (idx \\ halftoneHeight * 4)) long32At: 0] inSmalltalk: [self long32At: halftoneBase + (idx \\ halftoneHeight * 4)] will break RSqueak. Apologies if it does. Perhaps we can fund time to discuss the differences. I still don't understand how RSqueak uses primitive simulations, or why, if it does, we can't use a different subclass to isolate RSqueak and the VMSimulator from each other. This treading on each other's toes is getting painful ;-). For example if you used a consistent naming such as RSqueakFooSimulator and simply copied all the relevant simulation-specific plugin subclasses we would avoid treading on each other's toes and the system would be easier to understand. HTH On Thu, Feb 11, 2016 at 12:56 AM, <commits(a)source.squeak.org> wrote: > > Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-tfel.1677.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-tfel.1677 > Author: tfel > Time: 11 February 2016, 9:48:04.961 am > UUID: e845ffd7-66b9-594f-b02c-350f015e9cbf > Ancestors: VMMaker.oscog-EstebanLorenzano.1676 > > Fix BitBltSimulation (for RSqueak on Spur) > > =============== Diff against VMMaker.oscog-EstebanLorenzano.1676 > =============== > > Item was changed: > ----- Method: BitBlt>>simulatePrimitive:args: (in category > '*VMMaker-Interpreter') ----- > simulatePrimitive: aString args: args > "simulate primitives in RSqueak" > aString = 'primitiveCopyBits' > + ifTrue: [ > + args size = 1 > + ifTrue: [^ self copyBitsSimulated: (args > at: 1)] > + ifFalse: [^ self copyBitsSimulated]]. > - ifTrue: [^ self copyBitsSimulated]. > aString = 'primitiveWarpBits' > ifTrue: [^ self > warpBitsSimulated: (args at: 1) > sourceMap: (args at: 2)]. > ^ InterpreterProxy new primitiveFailFor: 255 > ! > > Item was changed: > ----- Method: BitBltSimulation>>loadColorMap (in category 'interpreter > interface') ----- > loadColorMap > "ColorMap, if not nil, must be longWords, and > 2^N long, where N = sourceDepth for 1, 2, 4, 8 bits, > or N = 9, 12, or 15 (3, 4, 5 bits per color) for 16 or 32 bits." > | cmSize oldStyle oop cmOop | > <inline: true> > cmFlags := cmMask := cmBitsPerColor := 0. > cmShiftTable := nil. > cmMaskTable := nil. > cmLookupTable := nil. > cmOop := interpreterProxy fetchPointer: BBColorMapIndex ofObject: > bitBltOop. > cmOop = interpreterProxy nilObject ifTrue:[^true]. > cmFlags := ColorMapPresent. "even if identity or somesuch - may be > cleared later" > oldStyle := false. > (interpreterProxy isWords: cmOop) ifTrue:[ > "This is an old-style color map (indexed only, with > implicit RGBA conversion)" > cmSize := interpreterProxy slotSizeOf: cmOop. > cmLookupTable := interpreterProxy firstIndexableField: > cmOop. > oldStyle := true. > ] ifFalse: [ > "A new-style color map (fully qualified)" > ((interpreterProxy isPointers: cmOop) > and:[(interpreterProxy slotSizeOf: cmOop) >= 3]) > ifFalse:[^false]. > cmShiftTable := self loadColorMapShiftOrMaskFrom: > (interpreterProxy fetchPointer: 0 ofObject: cmOop). > cmMaskTable := self loadColorMapShiftOrMaskFrom: > (interpreterProxy fetchPointer: 1 ofObject: cmOop). > oop := interpreterProxy fetchPointer: 2 ofObject: cmOop. > oop = interpreterProxy nilObject > ifTrue:[cmSize := 0] > ifFalse:[(interpreterProxy isWords: oop) > ifFalse:[^false]. > cmSize := (interpreterProxy > slotSizeOf: oop). > cmLookupTable := interpreterProxy > firstIndexableField: oop]. > cmFlags := cmFlags bitOr: ColorMapNewStyle. > self cCode: '' inSmalltalk: > + []. > - [self assert: cmShiftTable unitSize = 4. > - self assert: cmMaskTable unitSize = 4. > - self assert: cmLookupTable unitSize = 4]. > ]. > (cmSize bitAnd: cmSize - 1) = 0 ifFalse:[^false]. > cmMask := cmSize - 1. > cmBitsPerColor := 0. > cmSize = 512 ifTrue: [cmBitsPerColor := 3]. > cmSize = 4096 ifTrue: [cmBitsPerColor := 4]. > cmSize = 32768 ifTrue: [cmBitsPerColor := 5]. > cmSize = 0 > ifTrue:[cmLookupTable := nil. cmMask := 0] > ifFalse:[cmFlags := cmFlags bitOr: ColorMapIndexedPart]. > oldStyle "needs implicit conversion" > ifTrue:[ self setupColorMasks]. > "Check if colorMap is just identity mapping for RGBA parts" > (self isIdentityMap: cmShiftTable with: cmMaskTable) > ifTrue:[ cmMaskTable := nil. cmShiftTable := nil ] > ifFalse:[ cmFlags := cmFlags bitOr: ColorMapFixedPart]. > ^true! > > Item was added: > + ----- Method: BitBltSimulator>>halftoneAt: (in category 'memory access') > ----- > + halftoneAt: idx > + > + ^ (halftoneBase + (idx \\ halftoneHeight * 4)) long32At: 0! > > Item was added: > + ----- Method: InterpreterProxy>>isNonImmediate: (in category 'testing') > ----- > + isNonImmediate: anObject > + > + ^ (self isImmediate: anObject) not! > > Item was changed: > ----- Method: InterpreterProxy>>majorVersion (in category 'other') ----- > majorVersion > + ^ 1! > - self notYetImplemented! > > Item was changed: > ----- Method: InterpreterProxy>>minorVersion (in category 'other') ----- > minorVersion > + ^ 8! > - self notYetImplemented! > > Item was changed: > Object subclass: #TMethod > instanceVariableNames: 'args comment complete declarations > definingClass export extraVariableNumber globalStructureBuildMethodHasFoo > inline labels locals parseTree primitive properties returnType selector > sharedCase sharedLabel static writtenToGlobalVarsCache functionAttributes' > classVariableNames: 'CaseStatements' > poolDictionaries: '' > category: 'VMMaker-Translation to C'! > + > + !TMethod commentStamp: 'dtl 9/15/2008 09:06' prior: 0! > + A TMethod is a translation method, representing a MethodNode that is to > be translated to C source. It has a parseTree of translation nodes that > mirrors the parse tree of the corresponding Smalltalk method.! > > Item was changed: > Object subclass: #TParseNode > instanceVariableNames: 'comment' > classVariableNames: '' > poolDictionaries: '' > category: 'VMMaker-Translation to C'! > + > + !TParseNode commentStamp: 'dtl 9/15/2008 09:05' prior: 0! > + A TParseNode is node in the parse tree of a TMethod. Subclasses > correspond to different types of nodes in a method parse tree. The tree of > translation parse nodes mirrors the parse tree of a Smalltalk method, and > is used for translating a Smalltalk method to C source.! > > Item was changed: > ----- Method: VMClass>>oopForPointer: (in category 'memory access') ----- > oopForPointer: pointerOrSurrogate > "This gets implemented by Macros in C, where its types will also > be checked. > oop is the width of a machine word, and pointer is a raw address." > <doNotGenerate> > + ^pointerOrSurrogate! > - ^pointerOrSurrogate asInteger! > > -- _,,,^..^,,,_ best, Eliot

2 3

slang printf equivalent
by Ben Coman 21 Feb '16

21 Feb '16

What it the slang equivalent of a printf to output to the console to help debugging? cheers -ben

4 5

[commit][3625] CogVM sources as per VMMaker.oscog-eem.1690
by commits＠squeakvm.org 21 Feb '16

21 Feb '16

Revision: 3625 Author: eliot Date: 2016-02-20 20:56:31 -0800 (Sat, 20 Feb 2016) Log Message: ----------- CogVM sources as per VMMaker.oscog-eem.1690 Fix snafu in the previous commit of the StackInterpreter's followForwardingPointersInStackZone: Modified Paths: -------------- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2185,7 +2185,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1690"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -57819,7 +57819,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); + theIPPtr = GIV(instructionPointer) - GIV(method); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord()))); Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/nsspurstack64src/vm/interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2182,7 +2182,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1690"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -57810,7 +57810,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); + theIPPtr = GIV(instructionPointer) - GIV(method); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord()))); Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2155,7 +2155,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1690"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -38029,7 +38029,7 @@ static sqInt imageSegmentVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt wholeWord; + int wholeWord; /* first data word, 'does' */ @@ -55015,7 +55015,7 @@ sqInt slotBytes4; sqInt stopAddr; sqInt swapFloatWords; - sqInt temp; + int temp; sqInt temp1; sqInt wordAddr; @@ -56552,7 +56552,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); + theIPPtr = GIV(instructionPointer) - GIV(method); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0 << (shiftForWord()))); @@ -65687,7 +65687,7 @@ sqInt displayObj; sqInt primFailCodeValue; sqInt ptr; - sqInt reversed; + int reversed; sqInt w; sqInt wordEndIndex; sqInt wordStartIndex; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2152,7 +2152,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1690"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -38020,7 +38020,7 @@ static sqInt imageSegmentVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt wholeWord; + int wholeWord; /* first data word, 'does' */ @@ -55006,7 +55006,7 @@ sqInt slotBytes4; sqInt stopAddr; sqInt swapFloatWords; - sqInt temp; + int temp; sqInt temp1; sqInt wordAddr; @@ -56543,7 +56543,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); + theIPPtr = GIV(instructionPointer) - GIV(method); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0 << (shiftForWord()))); @@ -65678,7 +65678,7 @@ sqInt displayObj; sqInt primFailCodeValue; sqInt ptr; - sqInt reversed; + int reversed; sqInt w; sqInt wordEndIndex; sqInt wordStartIndex; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 20 20:43:54 PST 2016 + Sat Feb 20 20:55:51 PST 2016 Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2149,7 +2149,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1690]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -53660,7 +53660,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); + theIPPtr = GIV(instructionPointer) - GIV(method); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord()))); Modified: branches/Cog/spurstack64src/vm/interp.c =================================================================== --- branches/Cog/spurstack64src/vm/interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/spurstack64src/vm/interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2146,7 +2146,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1690]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -53651,7 +53651,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); + theIPPtr = GIV(instructionPointer) - GIV(method); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord()))); Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2119,7 +2119,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1690]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -52665,7 +52665,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); + theIPPtr = GIV(instructionPointer) - GIV(method); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0 << (shiftForWord()))); Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/spurstacksrc/vm/interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2116,7 +2116,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1690]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -52656,7 +52656,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); + theIPPtr = GIV(instructionPointer) - GIV(method); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0 << (shiftForWord()))); Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1884,7 +1884,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1690]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/stacksrc/vm/interp.c =================================================================== --- branches/Cog/stacksrc/vm/interp.c 2016-02-21 04:45:39 UTC (rev 3624) +++ branches/Cog/stacksrc/vm/interp.c 2016-02-21 04:56:31 UTC (rev 3625) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 from - StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed + StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1690 uuid: 963a9e1f-8445-4185-b59e-6cb7127ae490 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1881,7 +1881,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1690]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;

1 0

VM Maker: VMMaker.oscog-eem.1690.mcz
by commits＠source.squeak.org 21 Feb '16

21 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1690.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1690 Author: eem Time: 20 February 2016, 8:51:36.176356 pm UUID: 963a9e1f-8445-4185-b59e-6cb7127ae490 Ancestors: VMMaker.oscog-eem.1689 Fix snafu in the previous commit of the StackInterpreter's followForwardingPointersInStackZone: =============== Diff against VMMaker.oscog-eem.1689 =============== Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch and non-local return, we scan the receivers (including the stacked receiver for non-local return) and method references in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #theFP type: #'char *'> <var: #theIPPtr type: #usqInt> <var: #callerFP type: #'char *'> <var: #thePage type: #'StackPage *'> self externalWriteBackHeadFramePointers. (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: + [theIPPtr := instructionPointer - method. - [theIPPtr := instructionPointer - method asVoidPointer. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theFP callerFP offset oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." theIPPtr := thePage = stackPage ifTrue: [0] ifFalse: [thePage headSP asUnsignedInteger]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). oop := stackPages longAt: theFP + FoxReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxReceiver put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). delta := newOop - oop. stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]. offset := self frameStackedReceiverOffset: theFP. oop := stackPages longAt: theFP + offset. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + offset put: (objectMemory followForwarded: oop)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theFP := callerFP]. "And finally follow the caller context." self assert: theFP = thePage baseFP. oop := self frameCallerContext: theFP. (objectMemory isForwarded: oop) ifTrue: [self frameCallerContext: theFP put: (objectMemory followForwarded: oop)]]]!

1 0

[commit][3624] CogVM source as per VMMaker.oscog-eem.1689
by commits＠squeakvm.org 21 Feb '16

21 Feb '16

Revision: 3624 Author: eliot Date: 2016-02-20 20:45:39 -0800 (Sat, 20 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1689 ThreadedFFIPlugin: Arrange that the plugin includes sqFFI.h, but defines ThreadedFFIPlugin as 1 before hand so as to prevent sqFFI.h from declaring the old API. This allows the preambleCCode to eliminate its declarations of the surface functions, which (of course) fall foul of using ints where longts must be used on 64-bits. Since sqFFI.h declares these functions and is included everywhere relevant it is the gospel here. StackInterpreter: Eliminate warnings from followForwardingPointersInStackZone: by following the approach taken by the CoInterpreter's version. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c branches/Cog/src/vm/cogit.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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/build.linux64x64/makeallsqueak Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Copied: branches/Cog/build.linux64x64/makeallsqueak (from rev 3604, branches/Cog/build.linux64x64/makeall) =================================================================== --- branches/Cog/build.linux64x64/makeallsqueak (rev 0) +++ branches/Cog/build.linux64x64/makeallsqueak 2016-02-21 04:45:39 UTC (rev 3624) @@ -0,0 +1,9 @@ +#!/bin/bash +trap 'exit 2' HUP INT PIPE TERM +for d in squeak.*; do + if test -d "$d"; then + (cd ./$d;./makealldirty "$@") + else + echo no $d directory found + fi +done Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 + CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2442,7 +2442,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1685"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -19059,6 +19059,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -61536,7 +61538,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -67273,7 +67275,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2445,7 +2445,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1685"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -19068,6 +19068,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -61545,7 +61547,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -67282,7 +67284,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 + CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspursrc/vm/cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2411,7 +2411,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1685"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18388,6 +18388,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -66221,7 +66223,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -66350,7 +66352,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspursrc/vm/cointerp.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2414,7 +2414,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1685"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18397,6 +18397,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -66230,7 +66232,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -66359,7 +66361,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2185,7 +2185,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1685"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -57795,14 +57795,14 @@ sqInt delta; sqInt i; sqInt newOop; + sqInt offset; sqInt oop; - sqInt ptr; sqInt referent; sqInt referent1; sqInt referent2; sqInt referent3; char *theFP; - char *theIPPtr; + usqInt theIPPtr; StackPage *thePage; /* begin externalWriteBackHeadFramePointers */ @@ -57819,7 +57819,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - GIV(method); + theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord()))); @@ -57853,11 +57853,11 @@ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 - : (thePage->headSP)); + : ((usqInt)((thePage->headSP)))); while (1) { assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) - || (addressIsInPage(thePage, theIPPtr))); + || (addressIsInPage(thePage, ((void *)theIPPtr)))); oop = longAt(theFP + FoxReceiver); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { @@ -57884,14 +57884,14 @@ } longAtput(theFP + FoxMethod, (oop = newOop)); } - ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord()))))); - oop = longAt(ptr); + offset = (FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())); + oop = longAt(theFP + offset); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - longAtput(ptr, followForwarded(oop)); + longAtput(theFP + offset, followForwarded(oop)); } if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break; - theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP)); + theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; } assert(theFP == ((thePage->baseFP))); Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspurstack64src/vm/interp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2182,7 +2182,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1685"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -57786,14 +57786,14 @@ sqInt delta; sqInt i; sqInt newOop; + sqInt offset; sqInt oop; - sqInt ptr; sqInt referent; sqInt referent1; sqInt referent2; sqInt referent3; char *theFP; - char *theIPPtr; + usqInt theIPPtr; StackPage *thePage; /* begin externalWriteBackHeadFramePointers */ @@ -57810,7 +57810,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - GIV(method); + theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord()))); @@ -57844,11 +57844,11 @@ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 - : (thePage->headSP)); + : ((usqInt)((thePage->headSP)))); while (1) { assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) - || (addressIsInPage(thePage, theIPPtr))); + || (addressIsInPage(thePage, ((void *)theIPPtr)))); oop = longAt(theFP + FoxReceiver); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { @@ -57875,14 +57875,14 @@ } longAtput(theFP + FoxMethod, (oop = newOop)); } - ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord()))))); - oop = longAt(ptr); + offset = (FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())); + oop = longAt(theFP + offset); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - longAtput(ptr, followForwarded(oop)); + longAtput(theFP + offset, followForwarded(oop)); } if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break; - theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP)); + theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; } assert(theFP == ((thePage->baseFP))); Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2155,7 +2155,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1685"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -56528,14 +56528,14 @@ sqInt delta; sqInt i; sqInt newOop; + sqInt offset; sqInt oop; - sqInt ptr; sqInt referent; sqInt referent1; sqInt referent2; sqInt referent3; char *theFP; - char *theIPPtr; + usqInt theIPPtr; StackPage *thePage; /* begin externalWriteBackHeadFramePointers */ @@ -56552,7 +56552,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - GIV(method); + theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0 << (shiftForWord()))); @@ -56586,11 +56586,11 @@ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 - : (thePage->headSP)); + : ((usqInt)((thePage->headSP)))); while (1) { assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) - || (addressIsInPage(thePage, theIPPtr))); + || (addressIsInPage(thePage, ((void *)theIPPtr)))); oop = longAt(theFP + FoxReceiver); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { @@ -56617,14 +56617,14 @@ } longAtput(theFP + FoxMethod, (oop = newOop)); } - ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord()))))); - oop = longAt(ptr); + offset = (FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord())); + oop = longAt(theFP + offset); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - longAtput(ptr, followForwarded(oop)); + longAtput(theFP + offset, followForwarded(oop)); } if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break; - theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP)); + theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; } assert(theFP == ((thePage->baseFP))); Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2152,7 +2152,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1685"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -56519,14 +56519,14 @@ sqInt delta; sqInt i; sqInt newOop; + sqInt offset; sqInt oop; - sqInt ptr; sqInt referent; sqInt referent1; sqInt referent2; sqInt referent3; char *theFP; - char *theIPPtr; + usqInt theIPPtr; StackPage *thePage; /* begin externalWriteBackHeadFramePointers */ @@ -56543,7 +56543,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - GIV(method); + theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0 << (shiftForWord()))); @@ -56577,11 +56577,11 @@ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 - : (thePage->headSP)); + : ((usqInt)((thePage->headSP)))); while (1) { assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) - || (addressIsInPage(thePage, theIPPtr))); + || (addressIsInPage(thePage, ((void *)theIPPtr)))); oop = longAt(theFP + FoxReceiver); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { @@ -56608,14 +56608,14 @@ } longAtput(theFP + FoxMethod, (oop = newOop)); } - ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord()))))); - oop = longAt(ptr); + offset = (FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord())); + oop = longAt(theFP + offset); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - longAtput(ptr, followForwarded(oop)); + longAtput(theFP + offset, followForwarded(oop)); } if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break; - theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP)); + theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; } assert(theFP == ((thePage->baseFP))); Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 20 19:15:29 PST 2016 + Sat Feb 20 20:43:54 PST 2016 Modified: branches/Cog/spur64src/vm/cogit.h =================================================================== --- branches/Cog/spur64src/vm/cogit.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spur64src/vm/cogit.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 + CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/spur64src/vm/cointerp.c =================================================================== --- branches/Cog/spur64src/vm/cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spur64src/vm/cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2405,7 +2405,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1685]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14629,6 +14629,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -62288,7 +62290,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; Modified: branches/Cog/spur64src/vm/cointerp.h =================================================================== --- branches/Cog/spur64src/vm/cointerp.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spur64src/vm/cointerp.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/spur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spur64src/vm/gcc3x-cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spur64src/vm/gcc3x-cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2408,7 +2408,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1685]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14638,6 +14638,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -62297,7 +62299,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spursistasrc/vm/cogit.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 + CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spursistasrc/vm/cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2387,7 +2387,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1685]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17387,6 +17387,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -59237,7 +59239,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -64592,7 +64594,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -64964,7 +64966,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -65179,7 +65181,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spursistasrc/vm/cointerp.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2390,7 +2390,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1685]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17396,6 +17396,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -59246,7 +59248,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -64601,7 +64603,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -64973,7 +64975,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -65188,7 +65190,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spursrc/vm/cogit.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 + CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spursrc/vm/cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2374,7 +2374,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1685]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14272,6 +14272,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -61675,7 +61677,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spursrc/vm/cointerp.h 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2377,7 +2377,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1685]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14281,6 +14281,8 @@ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { assert(ifCurrentStackPageHasValidHeadPointers(thePage)); + + /* Skip the instruction pointer on top of stack of inactive pages. */ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -61684,7 +61686,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2149,7 +2149,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1685]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -53636,14 +53636,14 @@ sqInt delta; sqInt i; sqInt newOop; + sqInt offset; sqInt oop; - sqInt ptr; sqInt referent; sqInt referent1; sqInt referent2; sqInt referent3; char *theFP; - char *theIPPtr; + usqInt theIPPtr; StackPage *thePage; /* begin externalWriteBackHeadFramePointers */ @@ -53660,7 +53660,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - GIV(method); + theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord()))); @@ -53694,11 +53694,11 @@ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 - : (thePage->headSP)); + : ((usqInt)((thePage->headSP)))); while (1) { assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) - || (addressIsInPage(thePage, theIPPtr))); + || (addressIsInPage(thePage, ((void *)theIPPtr)))); oop = longAt(theFP + FoxReceiver); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { @@ -53725,14 +53725,14 @@ } longAtput(theFP + FoxMethod, (oop = newOop)); } - ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord()))))); - oop = longAt(ptr); + offset = (FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())); + oop = longAt(theFP + offset); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - longAtput(ptr, followForwarded(oop)); + longAtput(theFP + offset, followForwarded(oop)); } if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break; - theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP)); + theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; } assert(theFP == ((thePage->baseFP))); Modified: branches/Cog/spurstack64src/vm/interp.c =================================================================== --- branches/Cog/spurstack64src/vm/interp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spurstack64src/vm/interp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2146,7 +2146,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1685]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -53627,14 +53627,14 @@ sqInt delta; sqInt i; sqInt newOop; + sqInt offset; sqInt oop; - sqInt ptr; sqInt referent; sqInt referent1; sqInt referent2; sqInt referent3; char *theFP; - char *theIPPtr; + usqInt theIPPtr; StackPage *thePage; /* begin externalWriteBackHeadFramePointers */ @@ -53651,7 +53651,7 @@ assert(pageListIsWellFormed()); if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - theIPPtr = GIV(instructionPointer) - GIV(method); + theIPPtr = GIV(instructionPointer) - (((void *)GIV(method))); /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(method))); referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord()))); @@ -53685,11 +53685,11 @@ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 - : (thePage->headSP)); + : ((usqInt)((thePage->headSP)))); while (1) { assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) - || (addressIsInPage(thePage, theIPPtr))); + || (addressIsInPage(thePage, ((void *)theIPPtr)))); oop = longAt(theFP + FoxReceiver); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { @@ -53716,14 +53716,14 @@ } longAtput(theFP + FoxMethod, (oop = newOop)); } - ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord()))))); - oop = longAt(ptr); + offset = (FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())); + oop = longAt(theFP + offset); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - longAtput(ptr, followForwarded(oop)); + longAtput(theFP + offset, followForwarded(oop)); } if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break; - theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP)); + theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; } assert(theFP == ((thePage->baseFP))); Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2016-02-21 04:23:34 UTC (rev 3623) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2016-02-21 04:45:39 UTC (rev 3624) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed from - StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2119,7 +2119,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1689.mcz
by commits＠source.squeak.org 21 Feb '16

21 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1689.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1689 Author: eem Time: 20 February 2016, 8:26:37.272946 pm UUID: 4c473a09-7e78-4c59-b779-f2ad17e318ed Ancestors: VMMaker.oscog-eem.1688 ThreadedFFIPlugin: Arrange that the plugin includes sqFFI.h, but defines ThreadedFFIPlugin as 1 before hand so as to prevent sqFFI.h from declaring the old API. This allows the preambleCCode to eliminate its declarations of the surface functions, which (of course0 fall foul of using ints where longts must be used on 64-bits. Since sqFFI.h declares these functions and is included everywhere relevant it is the gospel here. StackInterpreter: Eliminate warnings from followForwardingPointersInStackZone: by following the approach taken by the CoInterpreter's version. =============== Diff against VMMaker.oscog-eem.1688 =============== Item was changed: ----- Method: CoInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch and non-local return, we scan the receivers (including the stacked receiver for non-local return) and method references in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become. Override to handle machine code frames" | theIPPtr | <inline: false> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #theIPPtr type: #usqInt> <var: #callerFP type: #'char *'> <var: #thePage type: #'StackPage *'> self externalWriteBackHeadFramePointers. (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop offset | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). theFP := thePage headFP. + "Skip the instruction pointer on top of stack of inactive pages." theIPPtr := thePage = stackPage ifTrue: [0] ifFalse: [thePage headSP asUnsignedInteger]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). (self isMachineCodeFrame: theFP) ifTrue: [oop := stackPages longAt: theFP + FoxMFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxMFReceiver put: (objectMemory followForwarded: oop)]. self assert: (objectMemory isForwarded: (self mframeHomeMethod: theFP) methodObject) not] ifFalse: [oop := stackPages longAt: theFP + FoxIFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. oop := self iframeMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop | newOop := objectMemory followForwarded: oop. offset := newOop - oop. (theIPPtr ~= 0 and: [(stackPages longAt: theIPPtr) > oop]) ifTrue: [stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + offset]. stackPages longAt: theFP + FoxIFSavedIP put: (stackPages longAt: theFP + FoxIFSavedIP) + offset. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. offset := self frameStackedReceiverOffset: theFP. oop := stackPages longAt: theFP + offset. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + offset put: (objectMemory followForwarded: oop)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theFP := callerFP]. "And finally follow the saved context and the caller context." theSP := thePage baseAddress - objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isForwarded: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory followForwarded: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch and non-local return, we scan the receivers (including the stacked receiver for non-local return) and method references in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #theFP type: #'char *'> + <var: #theIPPtr type: #usqInt> - <var: #theIPPtr type: #'char *'> <var: #callerFP type: #'char *'> <var: #thePage type: #'StackPage *'> self externalWriteBackHeadFramePointers. (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: + [theIPPtr := instructionPointer - method asVoidPointer. - [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: + [:i| | thePage theFP callerFP offset oop | - [:i| | thePage theFP callerFP ptr oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." + theIPPtr := thePage = stackPage ifTrue: [0] ifFalse: [thePage headSP asUnsignedInteger]. - theIPPtr := thePage = stackPage ifTrue: [0] ifFalse: [thePage headSP]. [self assert: (thePage addressIsInPage: theFP). + self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). - self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). oop := stackPages longAt: theFP + FoxReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxReceiver put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). delta := newOop - oop. stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]. + offset := self frameStackedReceiverOffset: theFP. + oop := stackPages longAt: theFP + offset. - ptr := (theFP + (self frameStackedReceiverOffset: theFP)) asInteger. - oop := stackPages longAt: ptr. (objectMemory isOopForwarded: oop) ifTrue: [stackPages + longAt: theFP + offset - longAt: ptr put: (objectMemory followForwarded: oop)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: + [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. - [theIPPtr := (theFP + FoxCallerSavedIP) asInteger. theFP := callerFP]. "And finally follow the caller context." self assert: theFP = thePage baseFP. oop := self frameCallerContext: theFP. (objectMemory isForwarded: oop) ifTrue: [self frameCallerContext: theFP put: (objectMemory followForwarded: oop)]]]! Item was changed: ----- Method: ThreadedFFIPlugin class>>preambleCCode (in category 'translation') ----- preambleCCode "For a source of builtin defines grep for builtin_define in a gcc release config directory." ^' #include "sqAssert.h" /* for assert */ + #define ThreadedFFIPlugin 1 /* to filter-out unwanted declarations from sqFFI.h */ + #include "sqFFI.h" /* for logging and surface functions */ #ifdef _MSC_VER # define alloca _alloca #endif #if defined(__GNUC__) && (defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__)) # define setsp(sp) asm volatile ("movl %0,%%esp" : : "m"(sp)) # define getsp() ({ void *esp; asm volatile ("movl %%esp,%0" : "=r"(esp) : ); esp;}) # elif defined(__GNUC__) && (defined(__arm__)) # define setsp(sp) asm volatile ("ldr %%sp, %0" : : "m"(sp)) # define getsp() ({ void *sp; asm volatile ("mov %0, %%sp" : "=r"(sp) : ); sp;}) #endif #if !!defined(getsp) # define getsp() 0 #endif #if !!defined(setsp) # define setsp(ignored) 0 #endif #if !!defined(STACK_ALIGN_BYTES) # if __APPLE__ && __MACH__ && __i386__ # define STACK_ALIGN_BYTES 16 # elif __linux__ && __i386__ # define STACK_ALIGN_BYTES 16 # elif defined(__amd64__) || defined(__x86_64__) || defined(__amd64) || defined(__x86_64) # define STACK_ALIGN_BYTES 16 # elif defined(powerpc) || defined(__powerpc__) || defined(_POWER) || defined(__POWERPC__) || defined(__PPC__) # define STACK_ALIGN_BYTES 16 # elif defined(__sparc64__) || defined(__sparcv9__) || defined(__sparc_v9__) /* must precede 32-bit sparc defs */ # define STACK_ALIGN_BYTES 16 # elif defined(sparc) || defined(__sparc__) || defined(__sparclite__) # define STACK_ALIGN_BYTES 8 # elif defined(__arm__) # define STACK_ALIGN_BYTES 8 # else # define STACK_ALIGN_BYTES 0 # endif #endif /* !!defined(STACK_ALIGN_BYTES) */ #if !!defined(STACK_OFFSET_BYTES) # define STACK_OFFSET_BYTES 0 #endif #if defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) /* Both Mac OS X x86 and Win32 x86 return structs of a power of two in size * less than or equal to eight bytes in length in registers. Linux never does so. */ # if __linux__ # define WIN32_X86_STRUCT_RETURN 0 # else # define WIN32_X86_STRUCT_RETURN 1 # endif # if WIN32 # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 1 # endif #endif /* defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) */ #if !!defined(ALLOCA_LIES_SO_USE_GETSP) # if defined(__MINGW32__) && (__GNUC__ >= 3) /* * cygwin -mno-cygwin (MinGW) gcc 3.4.x''s alloca is a library routine that answers * %esp + 4, so the outgoing stack is offset by one word if uncorrected. * Grab the actual stack pointer to correct. */ # define ALLOCA_LIES_SO_USE_GETSP 1 # else # define ALLOCA_LIES_SO_USE_GETSP 0 # endif #endif /* !!defined(ALLOCA_LIES_SO_USE_GETSP) */ #if !!defined(PLATFORM_API_USES_CALLEE_POPS_CONVENTION) # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 0 #endif /* The dispatchOn:in:with:with: generates an unwanted call on error. Just squash it. */ #define error(foo) 0 #ifndef SQUEAK_BUILTIN_PLUGIN /* but print assert failures. */ void warning(char *s) { /* Print an error message but don''t exit. */ printf("\n%s\n", s); } #endif /* sanitize */ #ifdef SQUEAK_BUILTIN_PLUGIN # define EXTERN #else # define EXTERN extern #endif - int ffiLogCallOfLength(void *, int); /* sqFFIPlugin.c */ - int ffiLogFileNameOfLength(void *, int); /* sqFFIPlugin.c */ - EXTERN void initSurfacePluginFunctionPointers(); /* sqManualSurface.c */ - EXTERN int createManualSurface(int, int, int, int, int); /* sqManualSurface.c */ - EXTERN int destroyManualSurface(int); /* sqManualSurface.c */ - EXTERN int setManualSurfacePointer(int, void*); /* sqManualSurface.c */ '!

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2016