Vm-dev May 2016

vm-dev@lists.squeakfoundation.org

36 participants
150 discussions

Interrupted system call error on OSX
by Jan van de Sandt 24 May '16

24 May '16

Hello VM list, I have a strange problem with a FFI call on OSX. When the called C library (libgit2) does a network call I get an "Interrupted system call" error. This only happens on OSX, Linux and Windows work fine. The old NativeBoost based FFI interface of Pharo4 also works fine. Could this issue be VM related? Jan VM Version: /Users/jan/Smalltalk/Pharo5-Git/Pharo.app/Contents/MacOS/Pharo CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 May 4 2016 StackToRegisterMappingCogit VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 May 4 2016 https://github.com/pharo-project/pharo-vm.git Commit: b8ec25a570d7539653e1d793e97609adb509aaed Date: 2016-05-04 11:14:22 +0200 By: Esteban Lorenzano <estebanlm(a)gmail.com> Jenkins build #589 Mac Cocoa Cog 5.8b12 21-Sep-10 >1B0534FA-246C-47C5-AB29-7A76C81CCDCB< VMMaker versionString https://github.com/pharo-project/pharo-vm.git Commit: b8ec25a570d7539653e1d793e97609adb509aaed Date: 2016-05-04 11:14:22 +0200 By: Esteban Lorenzano <estebanlm(a)gmail.com> Jenkins build #589 CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 May 4 2016 StackToRegisterMappingCogit VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 May 4 2016 ---------- Forwarded message ---------- From: Jan van de Sandt <jvdsandt(a)gmail.com> Date: Tue, May 17, 2016 at 9:33 PM Subject: UnifiedFFI Interrupted system call error on OSX To: Pharo Development List <pharo-dev(a)lists.pharo.org> Hi, I'm helping with the port of LibGit [1] from Pharo 4 to Pharo 5 [2]. This project provides Smalltalk bindings for the libgit2 library. Very useful for better Git support in Pharo. The port means using the new UnifiedFFI instead of NativeBoost. The project is still in the alpha stage but a lot of the libgit2 features are already accessible. Some libgit2 calls access the network. For example to clone a repository or to push a commit. The calls that use https work on Linux and on Windows but on OSX we always get the following error in Pharo 5: LGit_GIT_ERROR: Failed to connect to github.com: Interrupted system call. In Pharo4/NB this error does not occur. Could this be an issue in UFFI or perhaps in the VM ? To reproduce the problem in Pharo 5 (after loading [2]): | repo | repo := LGitRepository on: 'my-test-repo' asFileReference. repo cloneHttps: 'https://github.com/theseion/LibGit.git' Jan. [1] https://github.com/theseion/LibGit [2] https://github.com/jvdsandt/LibGit

1 0

VM Maker: BytecodeSets.spur-cb.53.mcz
by commits＠source.squeak.org 24 May '16

24 May '16

ClementBera uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-cb.53.mcz ==================== Summary ==================== Name: BytecodeSets.spur-cb.53 Author: cb Time: 24 May 2016, 11:30:56.10456 am UUID: 098a7e06-91dd-4d14-acde-a644275064ad Ancestors: BytecodeSets.spur-cb.52 Made a ready-to-integrate class comment. =============== Diff against BytecodeSets.spur-cb.52 =============== Item was changed: BlockClosure variableSubclass: #FullBlockClosure instanceVariableNames: 'receiver' classVariableNames: '' poolDictionaries: '' category: 'BytecodeSets-SistaV1'! + !FullBlockClosure commentStamp: 'cb 5/24/2016 11:30' prior: 0! + I contain a sequence of operations. I am defined by Smalltalk expressions inside square brackets. I permit to defer the enclosed operations until I execute a variant of #value. I can have my own arguments and temporaries as a regular method, but I am also able to use external variables: my enclosing method or block temporaries, arguments and receiver. - !FullBlockClosure commentStamp: 'cb 4/15/2016 10:20' prior: 0! - A FullBlockClosure is a closure that can be indepdendent of any outerContext if desired. It has its own method (currently reusing the startpc inst var) and its own receiver. outerContext can be either a MethodContext/Context or nil. + examples : + [ 1 + 2 ] value + [ :arg | + | temp | + temp := arg. + temp ] value: 5 + [ ^ 5 ] value - Instance Variables - receiver: <Object> + My return value corresponds to my final expression. A non local return (^) has the same effect as if I did not exist: it returns from my enclosing method, even if I'm nested in other blocks. - Here's an example (a chunk designed to be typed into the spurreader image with this class filed in, e.g. in the simulator), circa early 2016 for creating the recursive nfib example (|nfib|nfib:=nil.nfib:=[:n|n<=1ifTrue:[1]ifFalse:[(nfib value:n-1)+(nfib value:n-2)+1]].(1to:12)collect:nfib) using FullBlockClosure: + Implementation: - (| method closure | - method := (AssemblerMethod new - methodClass: Object; - selector: #nfib:; - numArgs: 1; - numTemps: 2; - literal: #ifTrue:ifFalse:; - pushTemporaryVariable: 0; - pushSpecialConstant: 1; - send: #<= super: false numArgs: 1; - jump: 'L1' if: false; - pushSpecialConstant: 1; - jump: 'L2'; - label: 'L1'; - pushRemoteTemp: 0 inVectorAt: 1; - pushTemporaryVariable: 0; - pushSpecialConstant: 1; - send: #- super: false numArgs: 1; - send: #value: super: false numArgs: 1; - pushRemoteTemp: 0 inVectorAt: 1; - pushTemporaryVariable: 0; - pushSpecialConstant: 2; - send: #- super: false numArgs: 1; - send: #value: super: false numArgs: 1; - send: #+ super: false numArgs: 1; - pushSpecialConstant: 1; - send: #+ super: false numArgs: 1; - label: 'L2'; - blockReturnTop; - yourself) assemble. - closure := FullBlockClosure new: 1. - closure - outerContext: nil; - compiledBlock: method; - numArgs: 1; - receiver: nil. - closure at: 1 put: (Array with: closure). - (1 to: 12) collect: closure!!) + A FullBlockClosure is a closure that can be independent of any outerContext if desired. It has its own method (currently reusing the startpc inst var) and its own receiver. outerContext can be either a MethodContext/Context or nil. + + This closure design, implemented by Eliot Miranda and Clement Bera along the sista work aims to simplify the block closure model while enhacing its capabilities. It allows lazy compilation of closures and fast machine code dispatch in Cog's JIT, while allowing inlining of methods and blocks to be independent from their enclosing blocks. + + At closure creation time, the bytecode specifies: + - the compiledBlock/compiledMethod to execute when executing this block's code (in the literal frame) + - if the receiver is the current receiver or a receiver passed on stack before the copied values. + - if the closure needs an outerContext. outerContexts are used for non local returns and debugging. Blocks with non local returns have to set their outerContext. For other blocks (97% of blocks), it's a trade-off between performance and debuggability. + + Instance Variables + outerContext: <Context/MethodContext|nil> + compiledBlock(startpc) <CompiledMethod/CompiledBlock> + numArgs <SmallInteger> + receiver: <Object> + ! - Here is a second example: - (| methodBlock outerMethod closure | - methodBlock := (AssemblerMethod new - methodClass: Object; - selector: #inblock2; - numTemps: 1; - pushTemporaryVariable: 0; - blockReturnTop; - yourself) assemble. - outerMethod := (AssemblerMethod new - encoder: EncoderForSistaV1 new; - methodClass: Object; - selector: #foo; - literal: methodBlock; - pushSpecialConstant: 1; - pushFullClosure: 0 numCopied: 1; - methodReturnTop; - yourself) assemble. - closure := #rcvr withArgs: #() executeMethod: outerMethod. - {closure at: 1 . closure receiver . closure value} !!)!

1 0

VM Maker: BytecodeSets.spur-cb.52.mcz
by commits＠source.squeak.org 24 May '16

24 May '16

ClementBera uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-cb.52.mcz ==================== Summary ==================== Name: BytecodeSets.spur-cb.52 Author: cb Time: 24 May 2016, 11:05:37.135424 am UUID: b86ffaac-ba7b-4347-bcfe-518fad49fc72 Ancestors: BytecodeSets.spur-cb.51 Some fix-ups related to recent changes in the SistaV1 bytecode set. I wonder if we should keep the pushNClosureTemps: instruction any more with the FullBlockClosure scheme. I believe it's useless. =============== Diff against BytecodeSets.spur-cb.51 =============== Item was changed: BytecodeEncoder subclass: #EncoderForSistaV1 (excessive size, no diff calculated) Item was changed: ----- Method: EncoderForSistaV1>>genStoreFlagExtensionIgnoreStoreCheck:maybeContext: (in category 'extended bytecode generation') ----- genStoreFlagExtensionIgnoreStoreCheck: ignoreStoreCheck maybeContext: maybeContext + "ignoreStoreCheck: + Can be applied to the long form of store and store pop of literal variable, remote inst var, remote temp, receiver inst var. + If present, the VM does not generate the GC store check. + The main reasons the compiler can ignore the store check are one of these two: + - the mutated object is always young + - the object stored is immediate + Currently the store check is for the remembered table, but we may have it for tri color marking later. So the compiler cannot really remove the store check if the object stored is old. + + maybeContext: + Can be used only with remote instance variable stores. If marked, the object can be a context and hence needs specific VM code. Receiver inst var have a separate encoding, temp vectors and literal variable can't be contexts" - "Can be applied to the long form of store and store pop of literal variable, remote inst var, remote temp, receiver inst var. - The notAContext bit can be used only with instance variable stores." self genUnsignedSingleExtendB: ignoreStoreCheck asBit + (maybeContext asBit << 1)! Item was added: + ----- Method: InstructionClient>>branchIfNotInstanceOf:distance: (in category '*BytecodeSets-instruction decoding') ----- + branchIfNotInstanceOf: literal distance: distance + "If the object on top of stack has the type -or one of the type- present in the literal (the literal is a behavior or an array of behavior), then pop it. Else jumps by the distance." + ! Item was added: + ----- Method: InstructionClient>>pushFullClosure:numCopied: (in category '*BytecodeSets-instruction decoding') ----- + pushFullClosure: compiledBlock numCopied: numCopied + "Creates and push a fullBlockClosure"! Item was added: + ----- Method: InstructionClient>>trap (in category '*BytecodeSets-instruction decoding') ----- + trap + "triggers a specific call-back in the runtime"! Item was removed: - ----- Method: InstructionClient>>trapIfNotInstanceOf: (in category '*BytecodeSets-SistaV1-decoding') ----- - trapIfNotInstanceOf: behaviorOrArrayOfBehavior - "If the top of stack is not an instance of either the argument, or, if the argument is an Array, - any of the elements of the argument, send the class trap message to the current context."! Item was changed: ----- Method: InstructionStream>>interpretNext2ByteSistaV1Instruction:for:extA:extB:startPC: (in category '*BytecodeSets-SistaV1-decoding') ----- interpretNext2ByteSistaV1Instruction: bytecode for: client extA: extA extB: extB startPC: startPC "Send to the argument, client, a message that specifies the next instruction. This method handles the two-byte codes. For a table of the bytecode set, see EncoderForV1's class comment." | byte method | method := self method. byte := self method at: pc. pc := pc + 1. "We do an inline quasi-binary search on bytecode" bytecode < 234 ifTrue: "pushes" [bytecode < 231 ifTrue: [bytecode < 229 ifTrue: [| literal | bytecode = 226 ifTrue: [^client pushReceiverVariable: (extA bitShift: 8) + byte]. literal := method literalAt: (extA bitShift: 8) + byte + 1. bytecode = 227 ifTrue: [^client pushLiteralVariable: literal]. ^client pushConstant: literal]. bytecode = 229 ifTrue: [^client pushTemporaryVariable: byte]. ^client pushClosureTemps: byte]. bytecode = 231 ifTrue: [^byte < 128 ifTrue: [client pushNewArrayOfSize: byte] ifFalse: [client pushConsArrayWithElements: byte - 128]]. bytecode = 232 ifTrue: [^client pushConstant: (extB bitShift: 8) + byte]. ^client pushConstant: (Character value: (extB bitShift: 8) + byte)]. + bytecode < 240 ifTrue: "sends and jump" - bytecode < 240 ifTrue: "sends, trap and jump" [bytecode < 236 ifTrue: "sends" [(bytecode = 235 and: [extB >= 64]) ifTrue: [^client directedSuperSend: (method literalAt: (extA bitShift: 5) + (byte // 8) + 1) numArgs: (extB - 64 bitShift: 3) + (byte \\ 8)]. ^client send: (method literalAt: (extA bitShift: 5) + (byte // 8) + 1) super: bytecode = 235 numArgs: (extB bitShift: 3) + (byte \\ 8)]. bytecode = 236 ifTrue: + [^self unusedBytecode: client at: startPC]. - [^client trapIfNotInstanceOf: (method literalAt: (extA bitShift: 8) + byte + 1)]. bytecode = 237 ifTrue: [^client jump: (extB bitShift: 8) + byte]. ^client jump: (extB bitShift: 8) + byte if: bytecode = 238]. bytecode < 243 ifTrue: [bytecode = 240 ifTrue: [^client popIntoReceiverVariable: (extA bitShift: 8) + byte]. bytecode = 241 ifTrue: [^client popIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. ^client popIntoTemporaryVariable: byte]. bytecode = 243 ifTrue: [^client storeIntoReceiverVariable: (extA bitShift: 8) + byte]. bytecode = 244 ifTrue: [^client storeIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. bytecode = 245 ifTrue: [^client storeIntoTemporaryVariable: byte]. "246-247 1111011 i xxxxxxxx UNASSIGNED" ^self unusedBytecode: client at: startPC! Item was changed: ----- Method: InstructionStream>>interpretNext3ByteSistaV1Instruction:for:extA:extB:startPC: (in category '*BytecodeSets-SistaV1-decoding') ----- interpretNext3ByteSistaV1Instruction: bytecode for: client extA: extA extB: extB startPC: startPC "Send to the argument, client, a message that specifies the next instruction. This method handles the three-byte codes. For a table of the bytecode set, see EncoderForSistaV1's class comment." | method byte2 byte3 literal | method := self method. byte2 := method at: pc. byte3 := method at: pc + 1. pc := pc + 2. "we search the bytecodes by what we expect to be the static frequency." bytecode = 248 ifTrue: [byte3 >= 128 ifTrue: [^client callInlinePrimitive: byte2 + (byte3 - 128 bitShift: 8)]. ^client callPrimitive: byte2 + (byte3 bitShift: 8)]. + "249 11111001 xxxxxxxx syyyyyyy Reserved for Push Float" + bytecode = 249 ifTrue: [^ self unusedBytecode: client at: startPC]. bytecode = 250 ifTrue: ["** 250 11111010 eeiiikkk jjjjjjjj Push Closure Num Copied iii (+ExtA//16*8) Num Args kkk (+ ExtA\\16*8) BlockSize jjjjjjjj (+ExtB*256). ee = num extensions" ^client pushClosureCopyNumCopiedValues: ((byte2 bitShift: -3) bitAnd: 7) + (extA // 16 bitShift: 3) numArgs: (byte2 bitAnd: 7) + (extA \\ 16 bitShift: 3) blockSize: byte3 + (extB bitShift: 8)]. bytecode = 251 ifTrue: [^client pushRemoteTemp: byte2 inVectorAt: byte3]. bytecode = 252 ifTrue: [^client storeIntoRemoteTemp: byte2 inVectorAt: byte3]. bytecode = 253 ifTrue: [^client popIntoRemoteTemp: byte2 inVectorAt: byte3]. + "** 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" - "249 11111001 xxxxxxxx syyyyyyy Reserved for Push Float" - "254-255 1111111 i xxxxxxxx yyyyyyyy UNASSIGNED" literal := method literalAt: (extA bitShift: 8) + byte2 + 1. + bytecode = 253 ifTrue: + [^ client branchIfNotInstanceOf: literal distance: (extB bitShift: 8) + byte3 ]. + "* 255 11111111 xxxxxxxx siyyyyyy push Closure Compiled block literal index xxxxxxxx (+ Extend A * 256) numCopied yyyyyy receiverOnStack: s = 1 ignoreOuterContext: i = 1" ^client pushFullClosure: literal + numCopied: (byte3 bitAnd: 16r3F).! - numCopied: byte3.! Item was changed: ----- Method: InstructionStream>>interpretNextSistaV1InstructionFor: (in category '*BytecodeSets-SistaV1-decoding') ----- interpretNextSistaV1InstructionFor: client "Send to the argument, client, a message that specifies the next instruction." | byte div16 offset method extA extB savedPC | method := self method. "For a table of the bytecode set, see EncoderForSistaV1's class comment." "consume and compute any extensions first." extA := extB := 0. savedPC := pc. [byte := self method at: pc. pc := pc + 1. byte >= 16rE0 and: [byte <= 16rE1]] whileTrue: [| extByte | extByte := self method at: pc. pc := pc + 1. byte = 16rE0 ifTrue: [extA := (extA bitShift: 8) + extByte] ifFalse: [extB := (extB = 0 and: [extByte > 127]) ifTrue: [extByte - 256] ifFalse: [(extB bitShift: 8) + extByte]]]. div16 := byte // 16. offset := byte \\ 16. "We do an inline quasi-binary search on each of the possible 16 values of div16" div16 < 11 ifTrue: [div16 < 6 ifTrue: [div16 < 4 ifTrue: [div16 < 2 ifTrue: [div16 = 0 ifTrue: [^client pushReceiverVariable: offset]. ^client pushLiteralVariable: (method literalAt: offset + 1)]. "div16 = 1" ^client pushConstant: (method literalAt: byte \\ 32 + 1)]. div16 = 4 ifTrue: [offset < 12 ifTrue: [^client pushTemporaryVariable: offset]. offset = 12 ifTrue: [^client pushReceiver]. offset = 13 ifTrue: [^client pushConstant: true]. offset = 14 ifTrue: [^client pushConstant: false]. offset = 15 ifTrue: [^client pushConstant: nil]]. "div16 = 5" offset < 2 ifTrue: [^client pushConstant: offset]. offset = 2 ifTrue: [^self interpretSistaV1ExtendedPush: extB for: client]. offset = 3 ifTrue: [^client doDup]. offset = 8 ifTrue: [^client methodReturnReceiver]. offset = 9 ifTrue: [^client methodReturnConstant: true]. offset = 10 ifTrue: [^client methodReturnConstant: false]. offset = 11 ifTrue: [^client methodReturnConstant: nil]. offset = 12 ifTrue: [^client methodReturnTop]. offset = 13 ifTrue: [^client blockReturnConstant: nil]. offset = 14 ifTrue: [^client blockReturnTop]. offset = 15 ifTrue: [^client doNop]. ^self unusedBytecode: client at: savedPC]. "short sends" div16 = 6 ifTrue: [^client send: (Smalltalk specialSelectorAt: offset + 1) super: false numArgs: (Smalltalk specialNargsAt: offset + 1)]. div16 = 7 ifTrue: [^client send: (Smalltalk specialSelectorAt: offset + 17) super: false numArgs: (Smalltalk specialNargsAt: offset + 17)]. ^client send: (method literalAt: offset + 1) super: false numArgs: div16 - 8]. "div16 >= 11; bytecode >= 176" div16 < 14 ifTrue: [div16 = 11 ifTrue: [offset < 8 ifTrue: [^client jump: offset + 1]. ^client jump: offset - 7 if: true]. div16 = 12 ifTrue: [offset < 8 ifTrue: [^client jump: offset + 1 if: false]. ^client popIntoReceiverVariable: offset - 8]. "div16 = 13" offset < 8 ifTrue: [^client popIntoTemporaryVariable: offset]. offset = 8 ifTrue: [ ^ client doPop ]. + offset = 8 ifTrue: [ ^ client trap ]. ^self unusedBytecode: client at: savedPC]. "2 byte and 3 byte codes" byte < 248 ifTrue: [^self interpretNext2ByteSistaV1Instruction: byte for: client extA: extA extB: extB startPC: savedPC]. ^self interpretNext3ByteSistaV1Instruction: byte for: client extA: extA extB: extB startPC: savedPC!

1 0

[commit][3728] CogVM source as per VMMaker.oscog-eem.1865
by commits＠squeakvm.org 24 May '16

24 May '16

Revision: 3728 Author: eliot Date: 2016-05-23 18:07:07 -0700 (Mon, 23 May 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1865 Fix two bugs in ephemerons (found by Gille Polito - thanks!). 1. obj stack extension must happen with marking set to true if new pages aren't to be GC'ed. So move the assignments to marking out into markObjects: where they can surround nilUnmarkedWeaklingSlots. 2. fireAllUnscannedEphemerons needs to enumerate the unscannedEphemerons set properly, an oop at a time. Use bytesPerOop instead of wordSize throughout unscannedEphemerons access for consistency. Fix the Spur implementation of becomeForward:copyHash: for becomming immediates with copyHash false. Fix the scavenger's referenceCountRememberedReferents: for forwarding to immediates, and add a printRememberedSet convenience. Make primitiveDoPrimitiveWithArgs usable as a mirror primitive, such that no message needs to be sent to the receiver to evaluate a primitive on it. This would make possible Context>>receiver: obj tryPrimitive: idx withArgs: args. Use symbolic constants for the primitive numbers of the primitive-executing primitives. Provide support for running the leak checker after an external primtiive call in the StackInterpreter (for debugging leaks in t' GdbARMPlugin). 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/processors/ARM/exploration/Makefile 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/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 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-05-24 00:32:16 UTC (rev 3727) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-05-24 01:07:07 UTC (rev 3728) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1860 uuid: 4d58d995-ee0c-4330-9190-adfa038e8f24 + CCodeGenerator VMMaker.oscog-eem.1865 uuid: 2aa4b0e0-004d-4599-896a-084a749a2c47 */ Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-05-24 00:32:16 UTC (rev 3727) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-05-24 01:07:07 UTC (rev 3728) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1860 uuid: 4d58d995-ee0c-4330-9190-adfa038e8f24 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1865 uuid: 2aa4b0e0-004d-4599-896a-084a749a2c47 from - CoInterpreter VMMaker.oscog-eem.1860 uuid: 4d58d995-ee0c-4330-9190-adfa038e8f24 + CoInterpreter VMMaker.oscog-eem.1865 uuid: 2aa4b0e0-004d-4599-896a-084a749a2c47 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1860 uuid: 4d58d995-ee0c-4330-9190-adfa038e8f24 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1865 uuid: 2aa4b0e0-004d-4599-896a-084a749a2c47 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -172,6 +172,7 @@ #define FoxSavedFP 0 #define FoxThisContext -16 #define FullClosureFirstCopiedValueIndex 4 +#define GCCheckPrimCall 64 #define GCModeBecome 8 #define GCModeFreeSpace 32 #define GCModeFull 1 @@ -281,6 +282,9 @@ #define PrimErrWritePastObject 17 #define PrimitiveExternalCallIndex 117 #define PrimNoErr 0 +#define PrimNumberDoExternalCall 218 +#define PrimNumberExternalCall 117 +#define PrimNumberFFICall 120 #define PrimTraceLogSize 256 #define PriorityIndex 2 #define ProcessListsIndex 0 @@ -919,6 +923,7 @@ static sqInt NoDbgRegParms isonWeaklingList(sqInt oop, sqInt listHead); static usqInt newSpaceCapacity(void); static sqInt noUnfiredEphemeronsAtEndOfRememberedSet(void); +extern void printRememberedSet(void); static void processEphemerons(void); static void processWeaklings(void); static sqInt NoDbgRegParms processWeakSurvivor(sqInt weakObj); @@ -1424,6 +1429,7 @@ static sqInt NoDbgRegParms marriedContextpointsTostackDeltaForCurrentFrame(sqInt spouseContext, sqInt anOop, sqInt stackDeltaForCurrentFrame); static void NoDbgRegParms marryContextInNewStackPageAndInitializeInterpreterRegisters(sqInt aContext); static sqInt NoDbgRegParms marryFrameSP(char *theFP, char *theSP); +static sqInt NoDbgRegParms maybeLeakCheckExternalPrimCall(sqInt aMethodObj); static sqInt NoDbgRegParms maybeSelectorOfMethod(sqInt methodObj); extern sqInt methodArgumentCount(void); extern sqInt methodArg(sqInt index); @@ -1623,8 +1629,8 @@ _iss char * stackBasePlus1; _iss sqInt weaklingStack; _iss sqInt trueObj; +_iss usqInt newSpaceStart; _iss sqInt falseObj; -_iss usqInt newSpaceStart; _iss sqInt hiddenRootsObj; _iss SpurSegmentInfo * segments; _iss sqInt lkupClassTag; @@ -1669,9 +1675,10 @@ _iss sqInt futureSurvivorStart; _iss sqInt longRunningPrimitiveCheckMethod; _iss char * objStackInvalidBecause; +_iss sqInt tempOop2; _iss sqInt ephemeronList; _iss usqInt freeOldSpaceStart; -_iss sqInt tempOop2; +_iss sqInt tempOop3; _iss sqInt tenureThreshold; _iss sqInt extraRootCount; _iss sqInt growHeadroom; @@ -1700,6 +1707,7 @@ _iss usqLong statGCEndUsecs; _iss sqInt weakList; _iss sqInt externalPrimitiveTableFirstFreeIndex; +_iss sqInt marking; _iss sqInt thisClassIndex; _iss sqInt firstSegmentSize; _iss usqLong gcStartUsecs; @@ -1711,7 +1719,6 @@ _iss sqInt lastHash; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt longRunningPrimitiveCheckSequenceNumber; -_iss sqInt marking; _iss usqInt memory; _iss sqInt numCompactionPasses; _iss sqInt scavengeInProgress; @@ -2435,8 +2442,9 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; +sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1860"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1865"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6206,6 +6214,7 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); + assert(maybeLeakCheckExternalPrimCall(GIV(newMethod))); /* begin maybeRetryFailureDueToForwarding */ if (GIV(primFailCode) && (checkForAndFollowForwardedPrimitiveState())) { @@ -13233,6 +13242,7 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); + assert(maybeLeakCheckExternalPrimCall(GIV(newMethod))); /* begin maybeRetryFailureDueToForwarding */ if (GIV(primFailCode) && (checkForAndFollowForwardedPrimitiveState())) { @@ -13595,6 +13605,7 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); + assert(maybeLeakCheckExternalPrimCall(GIV(newMethod))); /* begin maybeRetryFailureDueToForwarding */ if (GIV(primFailCode) && (checkForAndFollowForwardedPrimitiveState())) { @@ -14063,6 +14074,7 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); + assert(maybeLeakCheckExternalPrimCall(GIV(newMethod))); /* begin maybeRetryFailureDueToForwarding */ if (GIV(primFailCode) && (checkForAndFollowForwardedPrimitiveState())) { @@ -14533,6 +14545,7 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); + assert(maybeLeakCheckExternalPrimCall(GIV(newMethod))); /* begin maybeRetryFailureDueToForwarding */ if (GIV(primFailCode) && (checkForAndFollowForwardedPrimitiveState())) { @@ -17802,16 +17815,16 @@ /* For the method-executing primitives, failure could have been in those primitives or the primitives of the methods they execute. Find out which failed by seeing what is in effect. */ accessorDepth = primitiveAccessorDepthTable[primIndex]; - if (((primIndex == 117) + if (((primIndex == PrimNumberExternalCall) && (primitiveFunctionPointer != primitiveExternalCall)) - || ((primIndex == 218) + || ((primIndex == PrimNumberDoExternalCall) && (primitiveFunctionPointer != primitiveDoNamedPrimitiveWithArgs))) { accessorDepth = ((fetchPointerofObject(2, longAt((GIV(newMethod) + BaseHeaderSize) + (((long)(0 + LiteralStart)) << (shiftForWord()))))) >> 3); } else { assert(saneFunctionPointerForFailureOfPrimIndex(primIndex)); } - assert(((accessorDepth >= -127) && (accessorDepth <= 0x7F))); + assert(((accessorDepth >= -1) && (accessorDepth <= 4))); if (accessorDepth >= 0) { for (index = 0; index <= GIV(argumentCount); index += 1) { oop = longAt(GIV(stackPointer) + (index * BytesPerWord)); @@ -19599,6 +19612,7 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); + assert(maybeLeakCheckExternalPrimCall(GIV(newMethod))); /* begin maybeRetryFailureDueToForwarding */ if (GIV(primFailCode) && (checkForAndFollowForwardedPrimitiveState())) { @@ -23810,8 +23824,8 @@ if (GIV(profileSemaphore) != GIV(nilObj)) { baseFlags = baseFlags | PrimCallCollectsProfileSamples; } - if ((primIndex == 117) - || (primIndex == 120)) { + if ((primIndex == PrimNumberExternalCall) + || (primIndex == PrimNumberFFICall)) { /* For callbacks */ baseFlags = baseFlags | PrimCallMayCallBack; @@ -25711,6 +25725,7 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); + assert(maybeLeakCheckExternalPrimCall(GIV(newMethod))); /* begin maybeRetryFailureDueToForwarding */ if (GIV(primFailCode) && (checkForAndFollowForwardedPrimitiveState())) { @@ -41189,7 +41204,7 @@ sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); @@ -42991,7 +43006,7 @@ sqInt fmt; usqInt instBytes; sqInt instFormat; - usqInt newFormat; + sqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -44053,12 +44068,28 @@ long population[MaxRTRefCount + 1]; sqInt refCount; sqInt referent; + sqInt referent1; memset(population, 0, (sizeof(long)) * (MaxRTRefCount + 1)); assert(allNewSpaceObjectsHaveZeroRTRefCount()); /* begin referenceCountRememberedReferents: */ for (i1 = 0; i1 < GIV(rememberedSetSize); i1 += 1) { elephant = GIV(rememberedSet)[i1]; + if (((longAt(elephant)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(elephant)); + referent1 = longAt((elephant + BaseHeaderSize) + (0LL << (shiftForWord()))); + while (((referent1 & (tagMask())) == 0) + && (((longAt(referent1)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + referent1 = longAt((referent1 + BaseHeaderSize) + (0LL << (shiftForWord()))); + } + elephant = referent1; + if (elephant & (tagMask())) { + + /* take care if elephant forwarded to an immediate */ + elephant = GIV(nilObj); + } + } for (j1 = 0, jLimiT = ((numPointerSlotsOf(elephant)) - 1); j1 <= jLimiT; j1 += 1) { referent = longAt((elephant + BaseHeaderSize) + (((long)j1) << (shiftForWord()))); if (((referent & (tagMask())) == 0) @@ -44498,6 +44529,23 @@ } +/* Print the objects in the remembered set. */ + + /* SpurGenerationScavenger>>#printRememberedSet */ +void +printRememberedSet(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + + for (i = 0; i < GIV(rememberedSetSize); i += 1) { + printNum(i); + /* begin space */ + putchar(' '); + shortPrintOop(GIV(rememberedSet)[i]); + } +} + + /* There are ephemerons to be scavenged. Scavenge them and fire any whose keys are still in pastSpace and/or eden. The unscavenged ephemerons in this cycle @@ -47022,7 +47070,7 @@ sqInt objOop; sqInt p; - for (p = ((GIV(unscannedEphemerons).start)); p <= (((GIV(unscannedEphemerons).top)) - BytesPerOop); p += 1) { + for (p = ((GIV(unscannedEphemerons).start)); p <= (((GIV(unscannedEphemerons).top)) - BytesPerOop); p += BytesPerOop) { /* begin keyOfEphemeron: */ objOop = longAt(p); assert((isNonImmediate(objOop)) @@ -47095,7 +47143,7 @@ sqInt effectsFlags1; sqInt errCode; sqInt fieldOffset; - usqInt fieldOffset1; + sqInt fieldOffset1; sqInt fmt; sqInt hash; sqInt header; @@ -47155,20 +47203,20 @@ sp = longAt((array1 + BaseHeaderSize) + (((long)StackPointerIndex) << (shiftForWord()))); if (!((((sp) & 7) == 1))) { contextSize = 0; - goto l17; + goto l16; } assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(array1))); contextSize = (sp >> 3); - l17: /* end fetchStackPointerOf: */; + l16: /* end fetchStackPointerOf: */; fieldOffset = (((CtxtTempFrameStart - 1) + contextSize) * BytesPerOop) + BaseHeaderSize; - goto l18; + goto l17; } fieldOffset = (((numSlotsOf(array1)) - 1) * BytesPerOop) + BaseHeaderSize; - goto l18; + goto l17; } if (fmt < (firstCompiledMethodFormat())) { fieldOffset = 0; - goto l18; + goto l17; } /* begin methodHeaderOf: */ assert(isCompiledMethod(array1)); @@ -47182,7 +47230,7 @@ header = ((((CogMethod *) header1))->methodHeader); } fieldOffset = ((((literalCountOfMethodHeader(header)) + LiteralStart) - 1) * BytesPerOop) + BaseHeaderSize; - l18: /* end lastPointerOf: */; + l17: /* end lastPointerOf: */; /* same size as array2 */ effectsFlags = (size = 0); @@ -47267,14 +47315,14 @@ } if (!(((errCode = isOopValidBecome(oop1))) == 0)) { ec = errCode; - goto l21; + goto l20; } effectsFlags1 = effectsFlags1 | (becomeEffectFlagsFor(oop1)); fieldOffset1 -= BytesPerOop; } GIV(becomeEffectsFlags) = effectsFlags1; ec = 0; - l21: /* end containsOnlyValidBecomeObjects: */; + l20: /* end containsOnlyValidBecomeObjects: */; } if (ec != 0) { GIV(becomeEffectsFlags) = 0; @@ -47461,17 +47509,18 @@ long32Atput(obj21 + 4, ((((long32At(obj21 + 4)) | (identityHashHalfWordMask())) - (identityHashHalfWordMask()))) + hash); } if ((isOldObject(obj11)) - && (isYoungObject(obj21))) { + && (((obj21 & (tagMask())) == 0) + && (oopisLessThan(obj21, GIV(newSpaceLimit))))) { GIV(becomeEffectsFlags) = GIV(becomeEffectsFlags) | OldBecameNewFlag; } - assert(!((isForwarded(obj21)))); + assert(!((isOopForwarded(obj21)))); /* begin followField:ofObject: */ objOop4 = longAt((array1 + BaseHeaderSize) + (((long)i1) << (shiftForWord()))); if (((objOop4 & (tagMask())) == 0) && (((longAt(objOop4)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { objOop4 = fixFollowedFieldofObjectwithInitialValue(i1, array1, objOop4); } - assert(!(isForwarded(obj21))); + assert(!(isOopForwarded(obj21))); } } } @@ -55916,7 +55965,7 @@ /* Now remove the inactive ephemeron from the set, and scan-mark it. Scan-marking it may add more ephemerons to the set. */ foundInactive = 1; - (GIV(unscannedEphemerons).top = ((GIV(unscannedEphemerons).top)) - BytesPerWord); + (GIV(unscannedEphemerons).top = ((GIV(unscannedEphemerons).top)) - BytesPerOop); if (((GIV(unscannedEphemerons).top)) > ptr) { longAtput(ptr, longAt((GIV(unscannedEphemerons).top))); } @@ -56168,7 +56217,7 @@ l2: /* end markAndTrace: */; } else { - ptr += BytesPerWord; + ptr += BytesPerOop; } } return foundInactive; @@ -56194,6 +56243,7 @@ sqInt classTablePage; sqInt contextSize; sqInt contextSize1; + sqInt contextSize10; sqInt contextSize11; sqInt contextSize12; sqInt contextSize2; @@ -56209,6 +56259,7 @@ sqInt contextSize9; sqInt field; sqInt field1; + sqInt field10; sqInt field11; sqInt field12; sqInt field2; @@ -56224,6 +56275,7 @@ sqInt field9; sqInt fmt; sqInt fmt1; + sqInt fmt10; sqInt fmt11; sqInt fmt12; sqInt fmt2; @@ -56241,6 +56293,7 @@ sqInt format11; sqInt format110; sqInt format111; + sqInt format1110; sqInt format112; sqInt format113; sqInt format114; @@ -56250,6 +56303,7 @@ sqInt format118; sqInt format119; sqInt format12; + sqInt format120; sqInt format121; sqInt format122; sqInt format13; @@ -56271,6 +56325,7 @@ sqInt header1; sqInt header10; sqInt header11; + sqInt header110; sqInt header111; sqInt header112; sqInt header12; @@ -56285,6 +56340,7 @@ sqInt header18; sqInt header19; sqInt header2; + sqInt header20; sqInt header21; sqInt header22; sqInt header3; @@ -56305,6 +56361,7 @@ sqInt iLimiT; sqInt index; sqInt index1; + sqInt index10; sqInt index11; sqInt index12; sqInt index2; @@ -56323,6 +56380,7 @@ sqInt largestFree; sqInt numLiterals; sqInt numLiterals1; + sqInt numLiterals10; sqInt numLiterals11; sqInt numLiterals12; sqInt numLiterals2; @@ -56340,6 +56398,7 @@ usqInt numSlots1; usqInt numSlots10; usqInt numSlots11; + usqInt numSlots110; usqInt numSlots111; usqInt numSlots112; usqInt numSlots12; @@ -56354,6 +56413,7 @@ usqInt numSlots18; usqInt numSlots19; usqInt numSlots2; + usqInt numSlots20; usqInt numSlots21; usqInt numSlots22; usqInt numSlots3; @@ -56368,6 +56428,7 @@ usqInt numSlots9; sqInt numStrongSlots; sqInt numStrongSlots1; + sqInt numStrongSlots10; sqInt numStrongSlots11; sqInt numStrongSlots12; sqInt numStrongSlots2; @@ -56387,6 +56448,7 @@ sqInt objOop110; sqInt objOop111; sqInt objOop112; + sqInt objOop113; sqInt objOop12; sqInt objOop121; sqInt objOop122; @@ -56408,8 +56470,10 @@ sqInt objOop4; sqInt objOop41; sqInt objOop5; + sqInt objOop6; sqInt objToScan; sqInt objToScan1; + sqInt objToScan10; sqInt objToScan11; sqInt objToScan12; sqInt objToScan2; @@ -56432,6 +56496,7 @@ sqInt referent4; int scanLargeObject; int scanLargeObject1; + int scanLargeObject10; int scanLargeObject11; int scanLargeObject12; int scanLargeObject2; @@ -56448,6 +56513,7 @@ usqInt sizeOfUnusedEden; sqInt sp; sqInt sp1; + sqInt sp10; sqInt sp11; sqInt sp12; sqInt sp2; @@ -56465,6 +56531,7 @@ numStrongSlots = 0; numStrongSlots1 = 0; + numStrongSlots10 = 0; numStrongSlots11 = 0; numStrongSlots12 = 0; numStrongSlots2 = 0; @@ -56501,14 +56568,11 @@ ensureRoomOnObjStackAt(MarkStackRootIndex); /* begin initializeWeaklingStack */ ensureRoomOnObjStackAt(WeaklingStackRootIndex); + GIV(marking) = 1; /* begin markAccessibleObjectsAndFireEphemerons */ + assert(GIV(marking)); assert(validClassTableRootPages()); assert(allBridgesMarked()); - - /* This must come first to enable stack page reclamation. It clears - the trace flags on stack pages and so must precede any marking. - Otherwise it will clear the trace flags of reached pages. */ - GIV(marking) = 1; /* begin initStackPageGC */ if (GIV(stackPage) != 0) { /* begin externalWriteBackHeadFramePointers */ @@ -56534,9 +56598,9 @@ markAndTraceObjStackandContents(GIV(weaklingStack), 0); markAndTraceObjStackandContents(GIV(mournQueue), 1); /* begin setIsMarkedOf:to: */ - objOop19 = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)RememberedSetRootIndex) << (shiftForWord()))); - assert(!(isFreeObject(objOop19))); - longAtput(objOop19, (longAt(objOop19)) | (1LL << 55)); + objOop110 = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)RememberedSetRootIndex) << (shiftForWord()))); + assert(!(isFreeObject(objOop110))); + longAtput(objOop110, (longAt(objOop110)) | (1LL << 55)); /* begin setIsMarkedOf:to: */ assert((firstIndexableField(objectAfter(GIV(trueObj)))) == GIV(freeLists)); objOop21 = objectAfter(GIV(trueObj)); @@ -56547,35 +56611,35 @@ /* inline markAndShouldScan: */ if (GIV(hiddenRootsObj) & (tagMask())) { - goto l69; + goto l77; } assert(!(isForwarded(GIV(hiddenRootsObj)))); if (((((usqInt) (longAt(GIV(hiddenRootsObj)))) >> 55) & 1) != 0) { - goto l69; + goto l77; } /* begin setIsMarkedOf:to: */ assert(!(isFreeObject(GIV(hiddenRootsObj)))); longAtput(GIV(hiddenRootsObj), (longAt(GIV(hiddenRootsObj))) | (1LL << 55)); - format117 = (((usqInt) (longAt(GIV(hiddenRootsObj)))) >> (formatShift())) & (formatMask()); - if ((format117 >= (sixtyFourBitIndexableFormat())) - && (format117 < (firstCompiledMethodFormat()))) { + format119 = (((usqInt) (longAt(GIV(hiddenRootsObj)))) >> (formatShift())) & (formatMask()); + if ((format119 >= (sixtyFourBitIndexableFormat())) + && (format119 < (firstCompiledMethodFormat()))) { /* avoid pushing non-pointer objects on the markStack. */ /* Avoid tracing classes of non-objects on the heap, e.g. IRC caches, Sista counters. */ if (((longAt(GIV(hiddenRootsObj))) & (classIndexMask())) > (lastClassIndexPun())) { markAndTraceClassOf(GIV(hiddenRootsObj)); } - goto l69; + goto l77; } - if (format117 == (weakArrayFormat())) { + if (format119 == (weakArrayFormat())) { /* push weaklings on the weakling stack to scan later */ pushonObjStack(GIV(hiddenRootsObj), GIV(weaklingStack)); - goto l69; + goto l77; } - if ((format117 == 5) + if ((format119 == 5) && (activeAndDeferredScan(GIV(hiddenRootsObj)))) { - goto l69; + goto l77; } /* end markAndShouldScan:; fall through */ ; @@ -56583,211 +56647,211 @@ /* To avoid overflowing the mark stack when we encounter large objects, we push the obj, then its numStrongSlots, and then index the object from the stack. */ - objToScan8 = GIV(hiddenRootsObj); + objToScan9 = GIV(hiddenRootsObj); do { - if (objToScan8 & (tagMask())) { - scanLargeObject8 = 1; + if (objToScan9 & (tagMask())) { + scanLargeObject9 = 1; } else { /* begin numStrongSlotsOfInephemeral: */ - fmt8 = (((usqInt) (longAt(objToScan8))) >> (formatShift())) & (formatMask()); - assert((fmt8 != (ephemeronFormat())) - || (isMarked(keyOfEphemeron(objToScan8)))); - if (fmt8 <= 5) { + fmt9 = (((usqInt) (longAt(objToScan9))) >> (formatShift())) & (formatMask()); + assert((fmt9 != (ephemeronFormat())) + || (isMarked(keyOfEphemeron(objToScan9)))); + if (fmt9 <= 5) { /* begin numSlotsOf: */ flag("endianness"); - assert((classIndexOf(objToScan8)) > (isForwardedObjectClassIndexPun())); - numSlots18 = byteAt(objToScan8 + 7); - numSlots9 = (numSlots18 == (numSlotsMask()) - ? ((usqInt) (((unsigned long)(((long)(longAt(objToScan8 - BaseHeaderSize))) << 8)))) >> 8 - : numSlots18); - if (fmt8 <= 2) { - numStrongSlots8 = numSlots9; - goto l70; + assert((classIndexOf(objToScan9)) > (isForwardedObjectClassIndexPun())); + numSlots19 = byteAt(objToScan9 + 7); + numSlots10 = (numSlots19 == (numSlotsMask()) + ? ((usqInt) (((unsigned long)(((long)(longAt(objToScan9 - BaseHeaderSize))) << 8)))) >> 8 + : numSlots19); + if (fmt9 <= 2) { + numStrongSlots9 = numSlots10; + goto l78; } - if (fmt8 == (indexablePointersFormat())) { - if (((longAt(objToScan8)) & (classIndexMask())) == ClassMethodContextCompactIndex) { - setTraceFlagOnContextsFramesPageIfNeeded(objToScan8); + if (fmt9 == (indexablePointersFormat())) { + if (((longAt(objToScan9)) & (classIndexMask())) == ClassMethodContextCompactIndex) { + setTraceFlagOnContextsFramesPageIfNeeded(objToScan9); /* begin fetchStackPointerOf: */ - sp8 = longAt((objToScan8 + BaseHeaderSize) + (((long)StackPointerIndex) << (shiftForWord()))); - if (!((((sp8) & 7) == 1))) { - contextSize8 = 0; - goto l81; + sp9 = longAt((objToScan9 + BaseHeaderSize) + (((long)StackPointerIndex) << (shiftForWord()))); + if (!((((sp9) & 7) == 1))) { + contextSize9 = 0; + goto l89; } - assert((ReceiverIndex + ((sp8 >> 3))) < (lengthOf(objToScan8))); - contextSize8 = (sp8 >> 3); - l81: /* end fetchStackPointerOf: */; - numStrongSlots8 = CtxtTempFrameStart + contextSize8; - goto l70; + assert((ReceiverIndex + ((sp9 >> 3))) < (lengthOf(objToScan9))); + contextSize9 = (sp9 >> 3); + l89: /* end fetchStackPointerOf: */; + numStrongSlots9 = CtxtTempFrameStart + contextSize9; + goto l78; } - numStrongSlots8 = numSlots9; - goto l70; + numStrongSlots9 = numSlots10; + goto l78; } - if (fmt8 == (weakArrayFormat())) { + if (fmt9 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop111 = fetchClassOfNonImm(objToScan8); + objOop111 = fetchClassOfNonImm(objToScan9); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots8 = (((longAt((objOop111 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); - goto l70; + numStrongSlots9 = (((longAt((objOop111 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + goto l78; } } - if (fmt8 == 7) { - numStrongSlots8 = 1; - goto l70; + if (fmt9 == 7) { + numStrongSlots9 = 1; + goto l78; } - if (fmt8 < (firstCompiledMethodFormat())) { - numStrongSlots8 = 0; - goto l70; + if (fmt9 < (firstCompiledMethodFormat())) { + numStrongSlots9 = 0; + goto l78; } /* begin methodHeaderOf: */ - assert(isCompiledMethod(objToScan8)); - header18 = longAt((objToScan8 + BaseHeaderSize) + (((long)HeaderIndex) << (shiftForWord()))); - if ((((header18) & 7) == 1)) { - header9 = header18; + assert(isCompiledMethod(objToScan9)); + header19 = longAt((objToScan9 + BaseHeaderSize) + (((long)HeaderIndex) << (shiftForWord()))); + if ((((header19) & 7) == 1)) { + header10 = header19; } else { - assert((((usqInt)header18)) < GIV(newSpaceStart)); - assert((((((CogMethod *) header18))->objectHeader)) == (nullHeaderForMachineCodeMethod())); - header9 = ((((CogMethod *) header18))->methodHeader); + assert((((usqInt)header19)) < GIV(newSpaceStart)); + assert((((((CogMethod *) header19))->objectHeader)) == (nullHeaderForMachineCodeMethod())); + header10 = ((((CogMethod *) header19))->methodHeader); } /* begin literalCountOfMethodHeader: */ - assert((((header9) & 7) == 1)); - numLiterals8 = ((header9 >> 3)) & AlternateHeaderNumLiteralsMask; - numStrongSlots8 = numLiterals8 + LiteralStart; - l70: /* end numStrongSlotsOfInephemeral: */; - scanLargeObject8 = numStrongSlots8 > 64; + assert((((header10) & 7) == 1)); + numLiterals9 = ((header10 >> 3)) & AlternateHeaderNumLiteralsMask; + numStrongSlots9 = numLiterals9 + LiteralStart; + l78: /* end numStrongSlotsOfInephemeral: */; + scanLargeObject9 = numStrongSlots9 > 64; } - if (scanLargeObject8) { + if (scanLargeObject9) { /* scanning a large object. scan until hitting an unmarked object, then switch to it, if any. */ - if (objToScan8 & (tagMask())) { - index8 = (objToScan8 >> 3); - objToScan8 = topOfObjStack(GIV(markStack)); + if (objToScan9 & (tagMask())) { + index9 = (objToScan9 >> 3); + objToScan9 = topOfObjStack(GIV(markStack)); } else { - index8 = numStrongSlots8; - markAndTraceClassOf(objToScan8); + index9 = numStrongSlots9; + markAndTraceClassOf(objToScan9); } - while (index8 > 0) { - index8 -= 1; - field8 = longAt((objToScan8 + BaseHeaderSize) + (((long)index8) << (shiftForWord()))); - if ((field8 & (tagMask())) == 0) { - if (((longAt(field8)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + while (index9 > 0) { + index9 -= 1; + field9 = longAt((objToScan9 + BaseHeaderSize) + (((long)index9) << (shiftForWord()))); + if ((field9 & (tagMask())) == 0) { + if (((longAt(field9)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { /* fixFollowedField: is /not/ inlined */ - field8 = fixFollowedFieldofObjectwithInitialValue(index8, objToScan8, field8); + field9 = fixFollowedFieldofObjectwithInitialValue(index9, objToScan9, field9); } - if (field8 & (tagMask())) { - goto l68; + if (field9 & (tagMask())) { + goto l76; } - assert(!(isForwarded(field8))); - if (((((usqInt) (longAt(field8))) >> 55) & 1) != 0) { - goto l68; + assert(!(isForwarded(field9))); + if (((((usqInt) (longAt(field9))) >> 55) & 1) != 0) { + goto l76; } /* begin setIsMarkedOf:to: */ - assert(!(isFreeObject(field8))); - longAtput(field8, (longAt(field8)) | (1LL << 55)); - format121 = (((usqInt) (longAt(field8))) >> (formatShift())) & (formatMask()); + assert(!(isFreeObject(field9))); + longAtput(field9, (longAt(field9)) | (1LL << 55)); + format121 = (((usqInt) (longAt(field9))) >> (formatShift())) & (formatMask()); if ((format121 >= (sixtyFourBitIndexableFormat())) && (format121 < (firstCompiledMethodFormat()))) { /* avoid pushing non-pointer objects on the markStack. */ /* Avoid tracing classes of non-objects on the heap, e.g. IRC caches, Sista counters. */ - if (((longAt(field8)) & (classIndexMask())) > (lastClassIndexPun())) { - markAndTraceClassOf(field8); + if (((longAt(field9)) & (classIndexMask())) > (lastClassIndexPun())) { + markAndTraceClassOf(field9); } - goto l68; + goto l76; } if (format121 == (weakArrayFormat())) { /* push weaklings on the weakling stack to scan later */ - pushonObjStack(field8, GIV(weaklingStack)); - goto l68; + pushonObjStack(field9, GIV(weaklingStack)); + goto l76; } if ((format121 == 5) - && (activeAndDeferredScan(field8))) { - goto l68; + && (activeAndDeferredScan(field9))) { + goto l76; } /* end markAndShouldScan:; fall through */ - if (index8 > 0) { - if ((topOfObjStack(GIV(markStack))) != objToScan8) { - pushonObjStack(objToScan8, GIV(markStack)); + if (index9 > 0) { + if ((topOfObjStack(GIV(markStack))) != objToScan9) { + pushonObjStack(objToScan9, GIV(markStack)); } - pushonObjStack(((index8 << 3) | 1), GIV(markStack)); + pushonObjStack(((index9 << 3) | 1), GIV(markStack)); } - objToScan8 = field8; - index8 = -1; - l68: ; + objToScan9 = field9; + index9 = -1; + l76: ; } } - if (index8 >= 0) { + if (index9 >= 0) { /* if loop terminated without finding an unmarked referent, switch to top of stack. */ - objToScan8 = popObjStack(GIV(markStack)); - if (objToScan8 == GIV(hiddenRootsObj)) { - objToScan8 = popObjStack(GIV(markStack)); + objToScan9 = popObjStack(GIV(markStack)); + if (objToScan9 == GIV(hiddenRootsObj)) { + objToScan9 = popObjStack(GIV(markStack)); } } } else { /* scanning a small object. scan, marking, pushing unmarked referents, then switch to the top of the stack. */ - index8 = numStrongSlots8; - markAndTraceClassOf(objToScan8); - while (index8 > 0) { - index8 -= 1; - field8 = longAt((objToScan8 + BaseHeaderSize) + (((long)index8) << (shiftForWord()))); - if ((field8 & (tagMask())) == 0) { - if (((longAt(field8)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + index9 = numStrongSlots9; + markAndTraceClassOf(objToScan9); + while (index9 > 0) { + index9 -= 1; + field9 = longAt((objToScan9 + BaseHeaderSize) + (((long)index9) << (shiftForWord()))); + if ((field9 & (tagMask())) == 0) { + if (((longAt(field9)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { /* fixFollowedField: is /not/ inlined */ - field8 = fixFollowedFieldofObjectwithInitialValue(index8, objToScan8, field8); + field9 = fixFollowedFieldofObjectwithInitialValue(index9, objToScan9, field9); } - if (field8 & (tagMask())) { - goto l79; + if (field9 & (tagMask())) { + goto l87; } - assert(!(isForwarded(field8))); - if (((((usqInt) (longAt(field8))) >> 55) & 1) != 0) { - goto l79; + assert(!(isForwarded(field9))); + if (((((usqInt) (longAt(field9))) >> 55) & 1) != 0) { + goto l87; } /* begin setIsMarkedOf:to: */ - assert(!(isFreeObject(field8))); - longAtput(field8, (longAt(field8)) | (1LL << 55)); - format121 = (((usqInt) (longAt(field8))) >> (formatShift())) & (formatMask()); + assert(!(isFreeObject(field9))); + longAtput(field9, (longAt(field9)) | (1LL << 55)); + format121 = (((usqInt) (longAt(field9))) >> (formatShift())) & (formatMask()); if ((format121 >= (sixtyFourBitIndexableFormat())) && (format121 < (firstCompiledMethodFormat()))) { /* avoid pushing non-pointer objects on the markStack. */ /* Avoid tracing classes of non-objects on the heap, e.g. IRC caches, Sista counters. */ - if (((longAt(field8)) & (classIndexMask())) > (lastClassIndexPun())) { - markAndTraceClassOf(field8); + if (((longAt(field9)) & (classIndexMask())) > (lastClassIndexPun())) { + markAndTraceClassOf(field9); } - goto l79; + goto l87; } if (format121 == (weakArrayFormat())) { /* push weaklings on the weakling stack to scan later */ - pushonObjStack(field8, GIV(weaklingStack)); - goto l79; + pushonObjStack(field9, GIV(weaklingStack)); + goto l87; } if ((format121 == 5) - && (activeAndDeferredScan(field8))) { - goto l79; + && (activeAndDeferredScan(field9))) { + goto l87; } /* end markAndShouldScan:; fall through */ - pushonObjStack(field8, GIV(markStack)); - if (((byteAt(field8 + 7)) > 64) - && (((numStrongSlots8 = numStrongSlotsOfInephemeral(field8))) > 64)) { - pushonObjStack(((numStrongSlots8 << 3) | 1), GIV(markStack)); + pushonObjStack(field9, GIV(markStack)); + if (((byteAt(field9 + 7)) > 64) + && (((numStrongSlots9 = numStrongSlotsOfInephemeral(field9))) > 64)) { + pushonObjStack(((numStrongSlots9 << 3) | 1), GIV(markStack)); } - l79: ; + l87: ; } } - objToScan8 = popObjStack(GIV(markStack)); + objToScan9 = popObjStack(GIV(markStack)); } - } while(objToScan8 != null); - l69: /* end markAndTrace: */; - goto l84; + } while(objToScan9 != null); + l77: /* end markAndTrace: */; + goto l92; } /* begin setIsMarkedOf:to: */ assert(!(isFreeObject(GIV(hiddenRootsObj)))); @@ -56796,35 +56860,35 @@ /* inline markAndShouldScan: */ if (GIV(classTableFirstPage) & (tagMask())) { - goto l74; + goto l82; } assert(!(isForwarded(GIV(classTableFirstPage)))); if (((((usqInt) (longAt(GIV(classTableFirstPage)))) >> 55) & 1) != 0) { - goto l74; + goto l82; } /* begin setIsMarkedOf:to: */ assert(!(isFreeObject(GIV(classTableFirstPage)))); longAtput(GIV(classTableFirstPage), (longAt(GIV(classTableFirstPage))) | (1LL << 55)); - format116 = (((usqInt) (longAt(GIV(classTableFirstPage)))) >> (formatShift())) & (formatMask()); - if ((format116 >= (sixtyFourBitIndexableFormat())) - && (format116 < (firstCompiledMethodFormat()))) { + format118 = (((usqInt) (longAt(GIV(classTableFirstPage)))) >> (formatShift())) & (formatMask()); + if ((format118 >= (sixtyFourBitIndexableFormat())) + && (format118 < (firstCompiledMethodFormat()))) { /* avoid pushing non-pointer objects on the markStack. */ /* Avoid tracing classes of non-objects on the heap, e.g. IRC caches, Sista counters. */ if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) > (lastClassIndexPun())) { markAndTraceClassOf(GIV(classTableFirstPage)); } - goto l74; + goto l82; } - if (format116 == (weakArrayFormat())) { + if (format118 == (weakArrayFormat())) { /* push weaklings on the weakling stack to scan later */ pushonObjStack(GIV(classTableFirstPage), GIV(weaklingStack)); - goto l74; + goto l82; } - if ((format116 == 5) + if ((format118 == 5) && (activeAndDeferredScan(GIV(classTableFirstPage)))) { - goto l74; + goto l82; } /* end markAndShouldScan:; fall through */ ; @@ -56852,7 +56916,7 @@ : numSlots111); if (fmt11 <= 2) { numStrongSlots11 = numSlots21; - goto l77; + goto l85; } if (fmt11 == (indexablePointersFormat())) { if (((longAt(objToScan11)) & (classIndexMask())) == ClassMethodContextCompactIndex) { @@ -56861,32 +56925,32 @@ sp11 = longAt((objToScan11 + BaseHeaderSize) + (((long)StackPointerIndex) << (shiftForWord()))); if (!((((sp11) & 7) == 1))) { contextSize11 = 0; - goto l71; + goto l79; } assert((ReceiverIndex + ((sp11 >> 3))) < (lengthOf(objToScan11))); contextSize11 = (sp11 >> 3); - l71: /* end fetchStackPointerOf: */; + l79: /* end fetchStackPointerOf: */; numStrongSlots11 = CtxtTempFrameStart + contextSize11; - goto l77; + goto l85; } numStrongSlots11 = numSlots21; - goto l77; + goto l85; } if (fmt11 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ objOop121 = fetchClassOfNonImm(objToScan11); /* begin fixedFieldsOfClassFormat: */ numStrongSlots11 = (((longAt((objOop121 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); - goto l77; + goto l85; } } if (fmt11 == 7) { numStrongSlots11 = 1; - goto l77; + goto l85; } if (fmt11 < (firstCompiledMethodFormat())) { numStrongSlots11 = 0; - goto l77; + goto l85; } /* begin methodHeaderOf: */ assert(isCompiledMethod(objToScan11)); @@ -56903,7 +56967,7 @@ assert((((header21) & 7) == 1)); numLiterals11 = ((header21 >> 3)) & AlternateHeaderNumLiteralsMask; numStrongSlots11 = numLiterals11 + LiteralStart; - l77: /* end numStrongSlotsOfInephemeral: */; + l85: /* end numStrongSlotsOfInephemeral: */; scanLargeObject11 = numStrongSlots11 > 64; } if (scanLargeObject11) { @@ -56927,11 +56991,11 @@ field11 = fixFollowedFieldofObjectwithInitialValue(index11, objToScan11, field11); } if (field11 & (tagMask())) { - goto l73; + goto l81; } assert(!(isForwarded(field11))); if (((((usqInt) (longAt(field11))) >> 55) & 1) != 0) { - goto l73; + goto l81; } /* begin setIsMarkedOf:to: */ assert(!(isFreeObject(field11))); @@ -56945,17 +57009,17 @@ if (((longAt(field11)) & (classIndexMask())) > (lastClassIndexPun())) { markAndTraceClassOf(field11); } - goto l73; + goto l81; } if (format131 == (weakArrayFormat())) { /* push weaklings on the weakling stack to scan later */ pushonObjStack(field11, GIV(weaklingStack)); - goto l73; + goto l81; } if ((format131 == 5) && (activeAndDeferredScan(field11))) { - goto l73; + goto l81; } /* end markAndShouldScan:; fall through */ if (index11 > 0) { @@ -56966,7 +57030,7 @@ } objToScan11 = field11; index11 = -1; - l73: ; + l81: ; } } if (index11 >= 0) { @@ -56993,11 +57057,11 @@ field11 = fixFollowedFieldofObjectwithInitialValue(index11, objToScan11, field11); } if (field11 & (tagMask())) { - goto l67; + goto l75; } assert(!(isForwarded(field11))); if (((((usqInt) (longAt(field11))) >> 55) & 1) != 0) { - goto l67; + goto l75; } /* begin setIsMarkedOf:to: */ assert(!(isFreeObject(field11))); @@ -57011,17 +57075,17 @@ if (((longAt(field11)) & (classIndexMask())) > (lastClassIndexPun())) { markAndTraceClassOf(field11); } - goto l67; + goto l75; } if (format131 == (weakArrayFormat())) { /* push weaklings on the weakling stack to scan later */ pushonObjStack(field11, GIV(weaklingStack)); - goto l67; + goto l75; } if ((format131 == 5) && (activeAndDeferredScan(field11))) { - goto l67; + goto l75; } /* end markAndShouldScan:; fall through */ pushonObjStack(field11, GIV(markStack)); @@ -57029,20 +57093,20 @@ && (((numStrongSlots11 = numStrongSlotsOfInephemeral(field11))) > 64)) { pushonObjStack(((numStrongSlots11 << 3) | 1), GIV(markStack)); } - l67: ; + l75: ; } } objToScan11 = popObjStack(GIV(markStack)); } } while(objToScan11 != null); -l74: /* end markAndTrace: */; +l82: /* end markAndTrace: */; for (i4 = 1; i4 < GIV(numClassTablePages); i4 += 1) { /* begin setIsMarkedOf:to: */ - objOop4 = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i4) << (shiftForWord()))); - assert(!(isFreeObject(objOop4))); - longAtput(objOop4, (longAt(objOop4)) | (1LL << 55)); + objOop5 = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i4) << (shiftForWord()))); + assert(!(isFreeObject(objOop5))); + longAtput(objOop5, (longAt(objOop5)) | (1LL << 55)); } -l84: /* end markAndTraceHiddenRoots */; +l92: /* end markAndTraceHiddenRoots */; /* begin markAndTraceExtraRoots */ assert(GIV(remapBufferCount) == 0); for (i = 1; i <= GIV(extraRootCount); i += 1) { @@ -57109,7 +57173,7 @@ : numSlots1); if (fmt <= 2) { numStrongSlots = numSlots; - goto l31; + goto l34; } if (fmt == (indexablePointersFormat())) { if (((longAt(objToScan)) & (classIndexMask())) == ClassMethodContextCompactIndex) { @@ -57118,32 +57182,32 @@ sp = longAt((objToScan + BaseHeaderSize) + (((long)StackPointerIndex) << (shiftForWord()))); if (!((((sp) & 7) == 1))) { contextSize = 0; - goto l29; + goto l32; } assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objToScan))); contextSize = (sp >> 3); - l29: /* end fetchStackPointerOf: */; + l32: /* end fetchStackPointerOf: */; numStrongSlots = CtxtTempFrameStart + contextSize; - goto l31; + goto l34; } numStrongSlots = numSlots; - goto l31; + goto l34; } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ objOop11 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); - goto l31; + goto l34; } } if (fmt == 7) { numStrongSlots = 1; - goto l31; + goto l34; } if (fmt < (firstCompiledMethodFormat())) { numStrongSlots = 0; - goto l31; + goto l34; } /* begin methodHeaderOf: */ assert(isCompiledMethod(objToScan)); @@ -57160,7 +57224,7 @@ assert((((header) & 7) == 1)); numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; numStrongSlots = numLiterals + LiteralStart; - l31: /* end numStrongSlotsOfInephemeral: */; + l34: /* end numStrongSlotsOfInephemeral: */; scanLargeObject = numStrongSlots > 64; } if (scanLargeObject) { @@ -57303,39 +57367,39 @@ markAndTraceTraceLog(); markAndTracePrimTraceLog(); /* begin markAndTrace: */ - objOop3 = GIV(specialObjectsOop); + objOop4 = GIV(specialObjectsOop); /* inline markAndShouldScan: */ - if (objOop3 & (tagMask())) { - goto l12; + if (objOop4 & (tagMask())) { + goto l13; } - assert(!(isForwarded(objOop3))); - if (((((usqInt) (longAt(objOop3))) >> 55) & 1) != 0) { - goto l12; + assert(!(isForwarded(objOop4))); + if (((((usqInt) (longAt(objOop4))) >> 55) & 1) != 0) { + goto l13; } /* begin setIsMarkedOf:to: */ - assert(!(isFreeObject(objOop3))); - longAtput(objOop3, (longAt(objOop3)) | (1LL << 55)); - format18 = (((usqInt) (longAt(objOop3))) >> (formatShift())) & (formatMask()); - if ((format18 >= (sixtyFourBitIndexableFormat())) - && (format18 < (firstCompiledMethodFormat()))) { + assert(!(isFreeObject(objOop4))); + longAtput(objOop4, (longAt(objOop4)) | (1LL << 55)); + format19 = (((usqInt) (longAt(objOop4))) >> (formatShift())) & (formatMask()); + if ((format19 >= (sixtyFourBitIndexableFormat())) + && (format19 < (firstCompiledMethodFormat()))) { /* avoid pushing non-pointer objects on the markStack. */ /* Avoid tracing classes of non-objects on the heap, e.g. IRC caches, Sista counters. */ - if (((longAt(objOop3)) & (classIndexMask())) > (lastClassIndexPun())) { - markAndTraceClassOf(objOop3); + if (((longAt(objOop4)) & (classIndexMask())) > (lastClassIndexPun())) { + markAndTraceClassOf(objOop4); } - goto l12; + goto l13; } - if (format18 == (weakArrayFormat())) { + if (format19 == (weakArrayFormat())) { /* push weaklings on the weakling stack to scan later */ - pushonObjStack(objOop3, GIV(weaklingStack)); - goto l12; + pushonObjStack(objOop4, GIV(weaklingStack)); + goto l13; } - if ((format18 == 5) - && (activeAndDeferredScan(objOop3))) { - goto l12; + if ((format19 == 5) + && (activeAndDeferredScan(objOop4))) { + goto l13; } /* end markAndShouldScan:; fall through */ ; @@ -57343,65 +57407,65 @@ /* To avoid overflowing the mark stack when we encounter large objects, we push the obj, then its numStrongSlots, and then index the object from the stack. */ - objToScan7 = objOop3; + objToScan8 = objOop4; do { - if (objToScan7 & (tagMask())) { - scanLargeObject7 = 1; + if (objToScan8 & (tagMask())) { + scanLargeObject8 = 1; } else { /* begin numStrongSlotsOfInephemeral: */ - fmt1 = (((usqInt) (longAt(objToScan7))) >> (formatShift())) & (formatMask()); + fmt1 = (((usqInt) (longAt(objToScan8))) >> (formatShift())) & (formatMask()); assert((fmt1 != (ephemeronFormat())) - || (isMarked(keyOfEphemeron(objToScan7)))); + || (isMarked(keyOfEphemeron(objToScan8)))); if (fmt1 <= 5) { /* begin numSlotsOf: */ flag("endianness"); - assert((classIndexOf(objToScan7)) > (isForwardedObjectClassIndexPun())); - numSlots11 = byteAt(objToScan7 + 7); + assert((classIndexOf(objToScan8)) > (isForwardedObjectClassIndexPun())); + numSlots11 = byteAt(objToScan8 + 7); numSlots2 = (numSlots11 == (numSlotsMask()) - ? ((usqInt) (((unsigned long)(((long)(longAt(objToScan7 - BaseHeaderSize))) << 8)))) >> 8 + ? ((usqInt) (((unsigned long)(((long)(longAt(objToScan8 - BaseHeaderSize))) << 8)))) >> 8 : numSlots11); if (fmt1 <= 2) { - numStrongSlots7 = numSlots2; - goto l36; + numStrongSlots8 = numSlots2; + goto l39; } if (fmt1 == (indexablePointersFormat())) { - if (((longAt(objToScan7)) & (classIndexMask())) == ClassMethodContextCompactIndex) { - setTraceFlagOnContextsFramesPageIfNeeded(objToScan7); + if (((longAt(objToScan8)) & (classIndexMask())) == ClassMethodContextCompactIndex) { + setTraceFlagOnContextsFramesPageIfNeeded(objToScan8); /* begin fetchStackPointerOf: */ - sp1 = longAt((objToScan7 + BaseHeaderSize) + (((long)StackPointerIndex) << (shiftForWord()))); + sp1 = longAt((objToScan8 + BaseHeaderSize) + (((long)StackPointerIndex) << (shiftForWord()))); if (!((((sp1) & 7) == 1))) { contextSize1 = 0; - goto l34; + goto l37; } - assert((ReceiverIndex + ((sp1 >> 3))) < (lengthOf(objToScan7))); + assert((ReceiverIndex + ((sp1 >> 3))) < (lengthOf(objToScan8))); contextSize1 = (sp1 >> 3); - l34: /* end fetchStackPointerOf: */; - numStrongSlots7 = CtxtTempFrameStart + contextSize1; - goto l36; + l37: /* end fetchStackPointerOf: */; + numStrongSlots8 = CtxtTempFrameStart + contextSize1; + goto l39; } - numStrongSlots7 = numSlots2; - goto l36; + numStrongSlots8 = numSlots2; + goto l39; } if (fmt1 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop12 = fetchClassOfNonImm(objToScan7); + objOop12 = fetchClassOfNonImm(objToScan8); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots7 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); - goto l36; + numStrongSlots8 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + goto l39; } } if (fmt1 == 7) { - numStrongSlots7 = 1; - goto l36; + numStrongSlots8 = 1; + goto l39; } if (fmt1 < (firstCompiledMethodFormat())) { - numStrongSlots7 = 0; - goto l36; + numStrongSlots8 = 0; + goto l39; } /* begin methodHeaderOf: */ - assert(isCompiledMethod(objToScan7)); - header11 = longAt((objToScan7 + BaseHeaderSize) + (((long)HeaderIndex) << (shiftForWord()))); + assert(isCompiledMethod(objToScan8)); + header11 = longAt((objToScan8 + BaseHeaderSize) + (((long)HeaderIndex) << (shiftForWord()))); if ((((header11) & 7) == 1)) { header2 = header11; } @@ -57413,142 +57477,142 @@ /* begin literalCountOfMethodHeader: */ assert((((header2) & 7) == 1)); numLiterals1 = ((header2 >> 3)) & AlternateHeaderNumLiteralsMask; - numStrongSlots7 = numLiterals1 + LiteralStart; - l36: /* end numStrongSlotsOfInephemeral: */; - scanLargeObject7 = numStrongSlots7 > 64; + numStrongSlots8 = numLiterals1 + LiteralStart; + l39: /* end numStrongSlotsOfInephemeral: */; + scanLargeObject8 = numStrongSlots8 > 64; } - if (scanLargeObject7) { + if (scanLargeObject8) { /* scanning a large object. scan until hitting an unmarked object, then switch to it, if any. */ - if (objToScan7 & (tagMask())) { - index7 = (objToScan7 >> 3); - objToScan7 = topOfObjStack(GIV(markStack)); + if (objToScan8 & (tagMask())) { + index8 = (objToScan8 >> 3); + objToScan8 = topOfObjStack(GIV(markStack)); } else { - index7 = numStrongSlots7; - markAndTraceClassOf(objToScan7); + index8 = numStrongSlots8; + markAndTraceClassOf(objToScan8); } - while (index7 > 0) { - index7 -= 1; - field7 = longAt((objToScan7 + BaseHeaderSize) + (((long)index7) << (shiftForWord()))); - if ((field7 & (tagMask())) == 0) { - if (((longAt(field7)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + while (index8 > 0) { + index8 -= 1; + field8 = longAt((objToScan8 + BaseHeaderSize) + (((long)index8) << (shiftForWord()))); + if ((field8 & (tagMask())) == 0) { + if (((longAt(field8)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { /* fixFollowedField: is /not/ inlined */ - field7 = fixFollowedFieldofObjectwithInitialValue(index7, objToScan7, field7); + field8 = fixFollowedFieldofObjectwithInitialValue(index8, objToScan8, field8); } - if (field7 & (tagMask())) { - goto l25; + if (field8 & (tagMask())) { + goto l28; } - assert(!(isForwarded(field7))); - if (((((usqInt) (longAt(field7))) >> 55) & 1) != 0) { - goto l25; + assert(!(isForwarded(field8))); + if (((((usqInt) (longAt(field8))) >> 55) & 1) != 0) { + goto l28; } /* begin setIsMarkedOf:to: */ - assert(!(isFreeObject(field7))); - longAtput(field7, (longAt(field7)) | (1LL << 55)); - format115 = (((usqInt) (longAt(field7))) >> (formatShift())) & (formatMask()); - if ((format115 >= (sixtyFourBitIndexableFormat())) - && (format115 < (firstCompiledMethodFormat()))) { + assert(!(isFreeObject(field8))); + longAtput(field8, (longAt(field8)) | (1LL << 55)); + format117 = (((usqInt) (longAt(field8))) >> (formatShift())) & (formatMask()); + if ((format117 >= (sixtyFourBitIndexableFormat())) + && (format117 < (firstCompiledMethodFormat()))) { /* avoid pushing non-pointer objects on the markStack. */ /* Avoid tracing classes of non-objects on the heap, e.g. IRC caches, Sista counters. */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: Cog-tpr.325.mcz
by commits＠source.squeak.org 24 May '16

24 May '16

tim Rowledge uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-tpr.325.mcz ==================== Summary ==================== Name: Cog-tpr.325 Author: tpr Time: 23 May 2016, 6:00:12.059579 pm UUID: 7e784bae-2df8-483e-9ac1-10dd32ad81ae Ancestors: Cog-eem.324 Correct the offset for the floating point CPSR =============== Diff against Cog-eem.324 =============== Item was changed: ----- Method: GdbARMAlien>>fpCPSR (in category 'accessing') ----- fpCPSR "The VFP cpsr flags are kept as a single word in the Alien structure. Return just the top 4 bits, the actual flags" + ^(self unsignedLongAt: 1789) >>28! - ^(self unsignedLongAt: 1785) >>28!

1 0

VM Maker: Cog-eem.324.mcz
by commits＠source.squeak.org 24 May '16

24 May '16

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.324.mcz ==================== Summary ==================== Name: Cog-eem.324 Author: eem Time: 23 May 2016, 5:58:36.408062 pm UUID: 70c4f06e-0f45-4825-b4f8-15817f087454 Ancestors: Cog-eem.323 Fix offsets for the fp regs in the ARM alien now that we compile the code generator with -DMOTET =============== Diff against Cog-eem.323 =============== Item was changed: ----- Method: GdbARMAlien class>>dataSize (in category 'instance creation') ----- dataSize + ^1792! - ^1788! Item was changed: ----- Method: GdbARMAlien>>d0 (in category 'accessing') ----- d0 + ^self unsignedLongLongAt: 1533! - ^self unsignedLongLongAt: 1529! Item was changed: ----- Method: GdbARMAlien>>d0: (in category 'accessing') ----- d0: anUnsignedInteger + ^self unsignedLongLongAt: 1533 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1529 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d1 (in category 'accessing') ----- d1 + ^self unsignedLongLongAt: 1541! - ^self unsignedLongLongAt: 1537! Item was changed: ----- Method: GdbARMAlien>>d10 (in category 'accessing') ----- d10 + ^self unsignedLongLongAt: 1613! - ^self unsignedLongLongAt: 1609! Item was changed: ----- Method: GdbARMAlien>>d10: (in category 'accessing') ----- d10: anUnsignedInteger + ^self unsignedLongLongAt: 1613 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1609 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d11 (in category 'accessing') ----- d11 + ^self unsignedLongLongAt: 1621! - ^self unsignedLongLongAt: 1617! Item was changed: ----- Method: GdbARMAlien>>d11: (in category 'accessing') ----- d11: anUnsignedInteger + ^self unsignedLongLongAt: 1621 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1617 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d12 (in category 'accessing') ----- d12 + ^self unsignedLongLongAt: 1629! - ^self unsignedLongLongAt: 1625! Item was changed: ----- Method: GdbARMAlien>>d12: (in category 'accessing') ----- d12: anUnsignedInteger + ^self unsignedLongLongAt: 1629 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1625 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d13 (in category 'accessing') ----- d13 + ^self unsignedLongLongAt: 1637! - ^self unsignedLongLongAt: 1633! Item was changed: ----- Method: GdbARMAlien>>d13: (in category 'accessing') ----- d13: anUnsignedInteger + ^self unsignedLongLongAt: 1637 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1633 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d14 (in category 'accessing') ----- d14 + ^self unsignedLongLongAt: 1645! - ^self unsignedLongLongAt: 1641! Item was changed: ----- Method: GdbARMAlien>>d14: (in category 'accessing') ----- d14: anUnsignedInteger + ^self unsignedLongLongAt: 1645 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1641 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d15 (in category 'accessing') ----- d15 + ^self unsignedLongLongAt: 1653! - ^self unsignedLongLongAt: 1649! Item was changed: ----- Method: GdbARMAlien>>d15: (in category 'accessing') ----- d15: anUnsignedInteger + ^self unsignedLongLongAt: 1653 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1649 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d16 (in category 'accessing') ----- d16 + ^self unsignedLongLongAt: 1661! - ^self unsignedLongLongAt: 1657! Item was changed: ----- Method: GdbARMAlien>>d16: (in category 'accessing') ----- d16: anUnsignedInteger + ^self unsignedLongLongAt: 1661 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1657 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d17 (in category 'accessing') ----- d17 + ^self unsignedLongLongAt: 1669! - ^self unsignedLongLongAt: 1665! Item was changed: ----- Method: GdbARMAlien>>d17: (in category 'accessing') ----- d17: anUnsignedInteger + ^self unsignedLongLongAt: 1669 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1665 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d18 (in category 'accessing') ----- d18 + ^self unsignedLongLongAt: 1677! - ^self unsignedLongLongAt: 1673! Item was changed: ----- Method: GdbARMAlien>>d18: (in category 'accessing') ----- d18: anUnsignedInteger + ^self unsignedLongLongAt: 1677 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1673 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d19 (in category 'accessing') ----- d19 + ^self unsignedLongLongAt: 1685! - ^self unsignedLongLongAt: 1681! Item was changed: ----- Method: GdbARMAlien>>d19: (in category 'accessing') ----- d19: anUnsignedInteger + ^self unsignedLongLongAt: 1685 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1681 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d1: (in category 'accessing') ----- d1: anUnsignedInteger + ^self unsignedLongLongAt: 1541 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1537 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d2 (in category 'accessing') ----- d2 + ^self unsignedLongLongAt: 1549! - ^self unsignedLongLongAt: 1545! Item was changed: ----- Method: GdbARMAlien>>d20 (in category 'accessing') ----- d20 + ^self unsignedLongLongAt: 1693! - ^self unsignedLongLongAt: 1689! Item was changed: ----- Method: GdbARMAlien>>d20: (in category 'accessing') ----- d20: anUnsignedInteger + ^self unsignedLongLongAt: 1693 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1689 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d21 (in category 'accessing') ----- d21 + ^self unsignedLongLongAt: 1701! - ^self unsignedLongLongAt: 1697! Item was changed: ----- Method: GdbARMAlien>>d21: (in category 'accessing') ----- d21: anUnsignedInteger + ^self unsignedLongLongAt: 1701 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1697 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d22 (in category 'accessing') ----- d22 + ^self unsignedLongLongAt: 1709! - ^self unsignedLongLongAt: 1705! Item was changed: ----- Method: GdbARMAlien>>d22: (in category 'accessing') ----- d22: anUnsignedInteger + ^self unsignedLongLongAt: 1709 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1705 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d23 (in category 'accessing') ----- d23 + ^self unsignedLongLongAt: 1717! - ^self unsignedLongLongAt: 1713! Item was changed: ----- Method: GdbARMAlien>>d23: (in category 'accessing') ----- d23: anUnsignedInteger + ^self unsignedLongLongAt: 1717 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1713 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d24 (in category 'accessing') ----- d24 + ^self unsignedLongLongAt: 1725! - ^self unsignedLongLongAt: 1721! Item was changed: ----- Method: GdbARMAlien>>d24: (in category 'accessing') ----- d24: anUnsignedInteger + ^self unsignedLongLongAt: 1725 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1721 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d25 (in category 'accessing') ----- d25 + ^self unsignedLongLongAt: 1733! - ^self unsignedLongLongAt: 1729! Item was changed: ----- Method: GdbARMAlien>>d25: (in category 'accessing') ----- d25: anUnsignedInteger + ^self unsignedLongLongAt: 1733 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1729 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d26 (in category 'accessing') ----- d26 + ^self unsignedLongLongAt: 1741! - ^self unsignedLongLongAt: 1737! Item was changed: ----- Method: GdbARMAlien>>d26: (in category 'accessing') ----- d26: anUnsignedInteger + ^self unsignedLongLongAt: 1741 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1737 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d27 (in category 'accessing') ----- d27 + ^self unsignedLongLongAt: 1749! - ^self unsignedLongLongAt: 1745! Item was changed: ----- Method: GdbARMAlien>>d27: (in category 'accessing') ----- d27: anUnsignedInteger + ^self unsignedLongLongAt: 1749 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1745 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d28 (in category 'accessing') ----- d28 + ^self unsignedLongLongAt: 1757! - ^self unsignedLongLongAt: 1753! Item was changed: ----- Method: GdbARMAlien>>d28: (in category 'accessing') ----- d28: anUnsignedInteger + ^self unsignedLongLongAt: 1757 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1753 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d29 (in category 'accessing') ----- d29 + ^self unsignedLongLongAt: 1765! - ^self unsignedLongLongAt: 1761! Item was changed: ----- Method: GdbARMAlien>>d29: (in category 'accessing') ----- d29: anUnsignedInteger + ^self unsignedLongLongAt: 1765 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1761 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d2: (in category 'accessing') ----- d2: anUnsignedInteger + ^self unsignedLongLongAt: 1549 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1545 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d3 (in category 'accessing') ----- d3 + ^self unsignedLongLongAt: 1557! - ^self unsignedLongLongAt: 1553! Item was changed: ----- Method: GdbARMAlien>>d30 (in category 'accessing') ----- d30 + ^self unsignedLongLongAt: 1773! - ^self unsignedLongLongAt: 1769! Item was changed: ----- Method: GdbARMAlien>>d30: (in category 'accessing') ----- d30: anUnsignedInteger + ^self unsignedLongLongAt: 1773 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1769 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d31 (in category 'accessing') ----- d31 + ^self unsignedLongLongAt: 1781! - ^self unsignedLongLongAt: 1777! Item was changed: ----- Method: GdbARMAlien>>d31: (in category 'accessing') ----- d31: anUnsignedInteger + ^self unsignedLongLongAt: 1781 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1777 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d3: (in category 'accessing') ----- d3: anUnsignedInteger + ^self unsignedLongLongAt: 1557 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1553 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d4 (in category 'accessing') ----- d4 + ^self unsignedLongLongAt: 1565! - ^self unsignedLongLongAt: 1561! Item was changed: ----- Method: GdbARMAlien>>d4: (in category 'accessing') ----- d4: anUnsignedInteger + ^self unsignedLongLongAt: 1565 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1561 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d5 (in category 'accessing') ----- d5 + ^self unsignedLongLongAt: 1573! - ^self unsignedLongLongAt: 1569! Item was changed: ----- Method: GdbARMAlien>>d5: (in category 'accessing') ----- d5: anUnsignedInteger + ^self unsignedLongLongAt: 1573 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1569 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d6 (in category 'accessing') ----- d6 + ^self unsignedLongLongAt: 1581! - ^self unsignedLongLongAt: 1577! Item was changed: ----- Method: GdbARMAlien>>d6: (in category 'accessing') ----- d6: anUnsignedInteger + ^self unsignedLongLongAt: 1581 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1577 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d7 (in category 'accessing') ----- d7 + ^self unsignedLongLongAt: 1589! - ^self unsignedLongLongAt: 1585! Item was changed: ----- Method: GdbARMAlien>>d7: (in category 'accessing') ----- d7: anUnsignedInteger + ^self unsignedLongLongAt: 1589 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1585 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d8 (in category 'accessing') ----- d8 + ^self unsignedLongLongAt: 1597! - ^self unsignedLongLongAt: 1593! Item was changed: ----- Method: GdbARMAlien>>d8: (in category 'accessing') ----- d8: anUnsignedInteger + ^self unsignedLongLongAt: 1597 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1593 put: anUnsignedInteger! Item was changed: ----- Method: GdbARMAlien>>d9 (in category 'accessing') ----- d9 + ^self unsignedLongLongAt: 1605! - ^self unsignedLongLongAt: 1601! Item was changed: ----- Method: GdbARMAlien>>d9: (in category 'accessing') ----- d9: anUnsignedInteger + ^self unsignedLongLongAt: 1605 put: anUnsignedInteger! - ^self unsignedLongLongAt: 1601 put: anUnsignedInteger! Item was changed: ----- Method: SpurBootstrap>>allMethodPrototypes (in category 'method prototypes') ----- allMethodPrototypes "Answer all prototype selectors, including those marked <remove>" ^(imageTypes inject: (IdentitySet withAll: SpurBootstrapPrototypes allMethodPrototypes) into: [:allPrototypes :type | | prototypes | prototypes := (SpurBootstrapPrototypes prototypeClassFor: type) allMethodPrototypes. allPrototypes removeAllSuchThat: [:existing| prototypes anySatisfy: [:new| existing selector == new selector]]; + addAll: (prototypes reject: [:prototype| (prototype pragmaAt: #ignore) notNil]); - addAll: prototypes; yourself]) asArray sort: [:ma :mb| ma selector <= mb selector]! Item was added: + ----- Method: SpurBootstrapCuisPrototypes>>CharacterclassPROTOTYPEinitialize (in category 'method prototypes') ----- + CharacterclassPROTOTYPEinitialize + <ignore>!

1 0

[commit][3727] Make all advertised X11 display module options work with VM command line options .
by commits＠squeakvm.org 24 May '16

24 May '16

Revision: 3727 Author: lewis Date: 2016-05-23 17:32:16 -0700 (Mon, 23 May 2016) Log Message: ----------- Make all advertised X11 display module options work with VM command line options. Each module option must be declared in sqUnixMain.c in order for the command line option to be passed to its respective VM module. Other display and sound modules may require similar updates. Modified Paths: -------------- branches/Cog/platforms/unix/vm/sqUnixMain.c Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2016-05-24 00:14:35 UTC (rev 3726) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2016-05-24 00:32:16 UTC (rev 3727) @@ -1361,10 +1361,35 @@ return parseModuleArgument(argc, argv, &type##Module, #type, name); moduleArg("-nodisplay", display, "null"); + moduleArg("-browserWindow", display, "X11"); + moduleArg("-browserPipes", display, "X11"); + moduleArg("-closequit", display, "X11"); + moduleArg("-cmdmod", display, "X11"); + moduleArg("-compositioninput", display, "X11"); moduleArg("-display", display, "X11"); - moduleArg("-headless", display, "X11"); moduleArg("-fullscreen", display, "X11"); moduleArg("-fullscreenDirect", display, "X11"); +#if (USE_X11_GLX) + moduleArg("-glxdebug", display, "X11"); +#endif + moduleArg("-headless", display, "X11"); + moduleArg("-iconic", display, "X11"); + moduleArg("-lazy", display, "X11"); + moduleArg("-mapdelbs", display, "X11"); + moduleArg("-nointl", display, "X11"); + moduleArg("-notitle", display, "X11"); + moduleArg("-noxdnd", display, "X11"); + moduleArg("-optmod", display, "X11"); +#if defined(SUGAR) + moduleArg("-sugarBundleId", display, "X11"); + moduleArg("-sugarActivityId", display, "X11"); +#endif + moduleArg("-swapbtn", display, "X11"); + moduleArg("-xasync", display, "X11"); +#if defined(USE_XICFONT_OPTION) + moduleArg("-xicfont", display, "X11"); +#endif + moduleArg("-xshm", display, "X11"); moduleArg("-quartz", display, "Quartz"); moduleArg("-nosound", sound, "null");

1 0

[commit][3726] Make all advertised X11 display module options work with VM command line options .
by commits＠squeakvm.org 24 May '16

24 May '16

Revision: 3726 Author: lewis Date: 2016-05-23 17:14:35 -0700 (Mon, 23 May 2016) Log Message: ----------- Make all advertised X11 display module options work with VM command line options. Each module option must be declared in sqUnixMain.c in order for the command line option to be passed to its respective VM module. Other display and sound modules may require similar updates. Modified Paths: -------------- trunk/platforms/unix/vm/sqUnixMain.c Modified: trunk/platforms/unix/vm/sqUnixMain.c =================================================================== --- trunk/platforms/unix/vm/sqUnixMain.c 2016-05-22 23:29:12 UTC (rev 3725) +++ trunk/platforms/unix/vm/sqUnixMain.c 2016-05-24 00:14:35 UTC (rev 3726) @@ -1047,11 +1047,35 @@ return parseModuleArgument(argc, argv, &type##Module, #type, name); moduleArg("-nodisplay", display, "null"); + moduleArg("-browserWindow", display, "X11"); + moduleArg("-browserPipes", display, "X11"); + moduleArg("-closequit", display, "X11"); + moduleArg("-cmdmod", display, "X11"); + moduleArg("-compositioninput", display, "X11"); moduleArg("-display", display, "X11"); - moduleArg("-headless", display, "X11"); moduleArg("-fullscreen", display, "X11"); moduleArg("-fullscreenDirect", display, "X11"); - moduleArg("-compositioninput", display, "X11"); +#if (USE_X11_GLX) + moduleArg("-glxdebug", display, "X11"); +#endif + moduleArg("-headless", display, "X11"); + moduleArg("-iconic", display, "X11"); + moduleArg("-lazy", display, "X11"); + moduleArg("-mapdelbs", display, "X11"); + moduleArg("-nointl", display, "X11"); + moduleArg("-notitle", display, "X11"); + moduleArg("-noxdnd", display, "X11"); + moduleArg("-optmod", display, "X11"); +#if defined(SUGAR) + moduleArg("-sugarBundleId", display, "X11"); + moduleArg("-sugarActivityId", display, "X11"); +#endif + moduleArg("-swapbtn", display, "X11"); + moduleArg("-xasync", display, "X11"); +#if defined(USE_XICFONT_OPTION) + moduleArg("-xicfont", display, "X11"); +#endif + moduleArg("-xshm", display, "X11"); moduleArg("-quartz", display, "Quartz"); moduleArg("-nosound", sound, "null");

1 0

VM Maker: VMMaker.oscog-eem.1865.mcz
by commits＠source.squeak.org 24 May '16

24 May '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1865.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1865 Author: eem Time: 23 May 2016, 3:49:52.425548 pm UUID: 2aa4b0e0-004d-4599-896a-084a749a2c47 Ancestors: VMMaker.oscog-eem.1861 Fix two bugs in ephemerons (found by Gille Polito - thanks!). 1. obj stack extension must happen with marking set to true if new pages aren't to be GC'ed. So move the assignments to marking out into markObjects: where they can surround nilUnmarkedWeaklingSlots. 2. fireAllUnscannedEphemerons needs to enumerate the unscannedEphemerons set properly, an oop at a time. Use bytesPerOop instead of wordSize throughout unscannedEphemerons access for consistency. =============== Diff against VMMaker.oscog-eem.1861 =============== Item was changed: ----- Method: SpurMemoryManager>>allUnscannedEphemeronsAreActive (in category 'weakness and ephemerality') ----- allUnscannedEphemeronsAreActive + unscannedEphemerons start to: unscannedEphemerons top - self bytesPerOop by: self bytesPerOop do: - unscannedEphemerons start to: unscannedEphemerons top - self bytesPerOop do: [:p| | key | key := self keyOfEphemeron: (self longAt: p). ((self isImmediate: key) or: [self isMarked: key]) ifTrue: [^false]]. ^true! Item was changed: ----- Method: SpurMemoryManager>>fireAllUnscannedEphemerons (in category 'weakness and ephemerality') ----- fireAllUnscannedEphemerons self assert: (self noUnscannedEphemerons) not. self assert: self allUnscannedEphemeronsAreActive. + unscannedEphemerons start to: unscannedEphemerons top - self bytesPerOop by: self bytesPerOop do: - unscannedEphemerons start to: unscannedEphemerons top - self wordSize do: [:p| coInterpreter fireEphemeron: (self longAt: p)]! Item was changed: ----- Method: SpurMemoryManager>>markAccessibleObjectsAndFireEphemerons (in category 'gc - global') ----- markAccessibleObjectsAndFireEphemerons + self assert: marking. self assert: self validClassTableRootPages. self assert: segmentManager allBridgesMarked. self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" inSmalltalk: [MarkStackRecord ifNotNil: [MarkStackRecord resetTo: 1]]. - marking := true. "This must come first to enable stack page reclamation. It clears the trace flags on stack pages and so must precede any marking. Otherwise it will clear the trace flags of reached pages." coInterpreter initStackPageGC. self markAndTraceHiddenRoots. self markAndTraceExtraRoots. self assert: self validClassTableRootPages. coInterpreter markAndTraceInterpreterOops: true. self assert: self validObjStacks. self markWeaklingsAndMarkAndFireEphemerons. + self assert: self validObjStacks! - self assert: self validObjStacks. - marking := false! Item was changed: ----- Method: SpurMemoryManager>>markAllUnscannedEphemerons (in category 'weakness and ephemerality') ----- markAllUnscannedEphemerons "After firing the unscanned ephemerons we must scan-mark them. The wrinkle is that doing so may add more ephemerons to the set." | ptr | self assert: (self noUnscannedEphemerons) not. self assert: self allUnscannedEphemeronsAreActive. ptr := unscannedEphemerons top - self wordSize. [ptr >= unscannedEphemerons start] whileTrue: [| ephemeron key | key := self followedKeyOfEphemeron: (ephemeron := self longAt: ptr). self markAndTrace: key; markAndTrace: ephemeron. + unscannedEphemerons top: unscannedEphemerons top - self bytesPerOop. - unscannedEphemerons top: unscannedEphemerons top - self wordSize. ptr < unscannedEphemerons top ifTrue: ["not the last entry; remove it by overwriting it with the last ephemeron (which must have been newly added by markAndTrace:)." self longAt: ptr put: (self longAt: unscannedEphemerons top)]. + ptr := ptr - self bytesPerOop]! - ptr := ptr - self wordSize]! Item was changed: ----- Method: SpurMemoryManager>>markInactiveEphemerons (in category 'weakness and ephemerality') ----- markInactiveEphemerons "Go through the unscanned ephemerons, marking the inactive ones, and removing them from the unscanned ephemerons. Answer if any inactive ones were found. We cannot fire the ephemerons until all are found to be active since scan-marking an inactive ephemeron later in the set may render a previously-observed active ephemeron as inactive." | foundInactive ptr | foundInactive := false. ptr := unscannedEphemerons start. [ptr < unscannedEphemerons top] whileTrue: [| ephemeron key | key := self followedKeyOfEphemeron: (ephemeron := self longAt: ptr). ((self isImmediate: key) or: [self isMarked: key]) ifTrue: [foundInactive := true. "Now remove the inactive ephemeron from the set, and scan-mark it. Scan-marking it may add more ephemerons to the set." + unscannedEphemerons top: unscannedEphemerons top - self bytesPerOop. - unscannedEphemerons top: unscannedEphemerons top - self wordSize. unscannedEphemerons top > ptr ifTrue: [self longAt: ptr put: (self longAt: unscannedEphemerons top)]. self markAndTrace: ephemeron] ifFalse: + [ptr := ptr + self bytesPerOop]]. - [ptr := ptr + self wordSize]]. ^foundInactive! Item was changed: ----- Method: SpurMemoryManager>>markObjects: (in category 'gc - global') ----- markObjects: objectsShouldBeUnmarkedAndUnmarkedClassesShouldBeExpunged <inline: #never> "for profiling" "Mark all accessible objects. objectsShouldBeUnmarkedAndUnmarkedClassesShouldBeExpunged is true if all objects are unmarked and/or if unmarked classes shoud be removed from the class table." "If the incremental collector is running mark bits may be set; stop it and clear them if necessary." self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'marking...'; flush]. self runLeakCheckerFor: GCModeFull. self shutDownIncrementalGC: objectsShouldBeUnmarkedAndUnmarkedClassesShouldBeExpunged. self initializeUnscannedEphemerons. self initializeMarkStack. self initializeWeaklingStack. + marking := true. self markAccessibleObjectsAndFireEphemerons. self expungeDuplicateAndUnmarkedClasses: objectsShouldBeUnmarkedAndUnmarkedClassesShouldBeExpunged. + self nilUnmarkedWeaklingSlots. + marking := false! - self nilUnmarkedWeaklingSlots! Item was changed: ----- Method: SpurMemoryManager>>nilUnmarkedWeaklingSlots (in category 'weakness and ephemerality') ----- nilUnmarkedWeaklingSlots "Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack." <inline: #never> "for profiling" self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'nilling...'; flush]. self eassert: [self allOldMarkedWeakObjectsOnWeaklingStack]. weaklingStack = nilObj ifTrue: [^self]. self objStack: weaklingStack from: 0 do: [:weakling| | anyUnmarked | anyUnmarked := self nilUnmarkedWeaklingSlotsIn: weakling. anyUnmarked ifTrue: + ["fireFinalization: could grow the mournQueue and if so, + additional pages must be marked to avoid being GC'ed." + self assert: marking. + coInterpreter fireFinalization: weakling]]. - [coInterpreter fireFinalization: weakling]]. self emptyObjStack: weaklingStack! Item was changed: ----- Method: SpurMemoryManager>>pushOnUnscannedEphemeronsStack: (in category 'weakness and ephemerality') ----- pushOnUnscannedEphemeronsStack: anEphemeron "Attempt to push anEphemeron on the unscanned ephemerons stack and answer if the attempt succeeded. Note that the ephemeron stack overflowing isn't a disaster; it simply means treating the ephemeron as strong in this GC cycle." <inline: false> self assert: (self isEphemeron: anEphemeron). unscannedEphemerons top >= unscannedEphemerons limit ifTrue: [^false]. self longAt: unscannedEphemerons top put: anEphemeron. + unscannedEphemerons top: unscannedEphemerons top + self bytesPerOop. - unscannedEphemerons top: unscannedEphemerons top + self wordSize. ^true!

1 0

Minutes of the Meeting to Discuss Moving Cog to Github
by Eliot Miranda 23 May '16

23 May '16

Hi All, here are the minutes of, and action items arising from, the meeting on Wednesday 18th of May to discuss moving the Cog svn repository to Github. Please read if you're interested and discuss on vm-dev. The major decision for the community to participate in is when to make the change, which we hope will happen in the next few weeks. Thanks to all who attended the meeting and to all who have helped in making this a reality. This is exciting! VM Move to Github Meeting Notes The name of the organisation and repository was agreed to be, and has been created as Organisation name: OpenSmalltalk Repository name: vm URL: github.com/OpenSmalltalk/vm Administration duties: - Tim Felgentreff, David Lewis, Esteban Lorenzano, Eliot Miranda We decided to have everyone who currently has access to SVN also get write access to the new repository. There will be a master branch that is stable and from which releases are made using tags. Only administrators integrate into that branch. Ongoing development will be on a “dev” branch. This should also be kept stable for collaboration purposes, but breakage can happen occasionally. Contributors working on larger changes will do so on separate branches to avoid conflicts/breaking other people’s code. Every commit will be tested by Travis (and Appveyor for Windows). Builds and tests will be run for Windows, Linux, and OS X, both on 32-bit, 64-bit, and ARM (as applicable). The master will only ever be merged with green commits. The dev branch should be green, and if something breaks, but the committer has no access or no time to fix it, we agreed that any administrator may roll back the breaking change using git revert. This way, the breaking change is preserved in the history, but the current HEAD is green. We will also disable “force-pushing” to the repository to ensure that no commit history can be tampered with. In case of any disagreements about reverting other people’s code, we declared Eliot (*) to be the arbiter. Release tags on the master will trigger Travis to build release artifacts, including debian packages. To have incremental monotonic, human-readable version identifiers, we decided to use timestamps in the form YYYYMMDDHHmm in UTC. In order to ensure these timestamps are included in the sources, we will have a commit script in the repository that any contributor must use to update the dev and master branches (**). The checkout command for any version then becomes “git checkout branch@{timestamp}”. Both the built VMs via a -version flag, and sources via a header file, will be marked with these timestamps. It was decided to leave the build system as-is using GNU Makefiles where available with a commitment to move to GNU Makefiles on Linux. We will use CMake to produce per-platform config files that identify platform facilities (such as epoll(2) vs kqueue(2) vs poll(s) vs select(3)). We discussed ethics, which derive from the “if you break it, you fix it” philosophy and distilled it into the “administrators may revert” policy above. We don’t want to prevent breakages, nor make people afraid of breaking things. We merely want to prevent other people being affected by breakages, especially those that may be operating under production or time constraints. We will integrate the Github commit notifications with a Codespeed instance that will test commits for performance regressions. Action Items - Write the commit script - Set a date for the move (sooner rather than later) - Move the repository - Enable automatic builds for all the platforms - Write GNU makefiles for unix/linux - Make WebHooks for Commit Notifications available to anyone who wants them. - Write CMake code to generate per-platform headers (***) _,,,^..^,,,_ best, Eliot (*) under protest (**) use whatever versioning you want on your own versions, but the versions in OpenSmalltalk/vm will use this convention exclusively (***) which will /not/ be called "config.h", but e.g. "ostvmConfig.h", so as to avoid conflicts with other packages using autoconf and CMake

8 12

← Newer
1
2
3
4
5
6
7
8
9
...
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 May 2016