Vm-dev May 2014

vm-dev@lists.squeakfoundation.org

32 participants
151 discussions

VM Maker: VMMaker.oscog-eem.730.mcz
by commits＠source.squeak.org 21 May '14

21 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.730.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.730 Author: eem Time: 21 May 2014, 11:42:14.362 am UUID: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 Ancestors: VMMaker.oscog-eem.729 more typos :-/ =============== Diff against VMMaker.oscog-eem.729 =============== Item was changed: ----- Method: SpurSegmentManager>>findEmptySegNearestInSizeTo: (in category 'growing/shrinking memory') ----- findEmptySegNearestInSizeTo: size | seg best delta | + <var: #seg type: #'SpurSegmentInfo *'> - <var: #seg type: #'SegmentInfo *'> best := nil. delta := size. 0 to: numSegments - 1 do: [:i| seg := self addressOf: (segments at: i). (self isEmptySegment: seg) ifTrue: [best ifNil: [best := seg] ifNotNil: [(size >= (seg segSize * 0.75) and: [(seg segSize - size) abs < delta]) ifTrue: [best := seg. delta := (seg segSize - size) abs]]]]. ^best! Item was changed: ----- Method: SpurSegmentManager>>indexOfSegment: (in category 'growing/shrinking memory') ----- indexOfSegment: seg + <var: #seg type: #'SpurSegmentInfo *'> - <var: #seg type: #'SegmentInfo *'> 0 to: numSegments - 1 do: [:i| seg segStart = (segments at: i) segStart ifTrue: [^i]]. self error: 'segment not found'! Item was changed: ----- Method: SpurSegmentManager>>isEmptySegment: (in category 'growing/shrinking memory') ----- isEmptySegment: seg + <var: #seg type: #'SpurSegmentInfo *'> - <var: #seg type: #'SegmentInfo *'> | firstObj | firstObj := manager objectStartingAt: seg segStart. ^(manager isFreeObject: firstObj) and: [(manager addressAfter: firstObj) = (seg segLimit - manager bridgeSize)]! Item was changed: ----- Method: SpurSegmentManager>>shrinkObjectMemory: (in category 'growing/shrinking memory') ----- shrinkObjectMemory: delta | shrinkage emptySeg | + <var: #emptySeg type: #'SpurSegmentInfo *'> - <var: #emptySeg type: #'SegmentInfo *'> shrinkage := delta. [emptySeg := self findEmptySegNearestInSizeTo: shrinkage. emptySeg notNil] whileTrue: [shrinkage := shrinkage - emptySeg segSize. manager detachFreeObject: (manager objectStartingAt: emptySeg segStart). self removeSegment: emptySeg]!

1 0

VM Maker: VMMaker.oscog-eem.729.mcz
by commits＠source.squeak.org 21 May '14

21 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.729.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.729 Author: eem Time: 21 May 2014, 11:09:39.734 am UUID: 611ca439-fb89-4d43-a138-ebbd559c605a Ancestors: VMMaker.oscog-eem.728 Fix a typo to the segment deallocator, for consistency. =============== Diff against VMMaker.oscog-eem.728 =============== Item was added: + ----- Method: SpurMemoryManager>>sqDeallocateMemorySegmentAt:OfSize: (in category 'simulation only') ----- + sqDeallocateMemorySegmentAt: startAddress OfSize: ammount + "This is a nop in the simulator." + <doNotGenerate>! Item was removed: - ----- Method: SpurMemoryManager>>sqDeallocateMemorySegmentAt:ofSize: (in category 'simulation only') ----- - sqDeallocateMemorySegmentAt: startAddress ofSize: ammount - "This is a nop in the simulator." - <doNotGenerate>! Item was changed: ----- Method: SpurSegmentManager>>removeSegment: (in category 'growing/shrinking memory') ----- removeSegment: emptySeg <var: #emptySeg type: #'SpurSegmentInfo *'> | i | i := self indexOfSegment: emptySeg. self assert: i > 0. + manager sqDeallocateMemorySegmentAt: emptySeg segStart OfSize: emptySeg segSize. - manager sqDeallocateMemorySegmentAt: emptySeg segStart ofSize: emptySeg segSize. i to: numSegments - 1 do: [:j| segments at: j put: (segments at: j + 1)]. self cCode: [] inSmalltalk: [segments at: numSegments - 1 put: SpurSegmentInfo new]. numSegments := numSegments - 1. self bridgeFrom: (self addressOf: (segments at: i - 1)) to: (i <= (numSegments - 1) ifTrue: [self addressOf: (segments at: i)]). manager setLastSegment: (self addressOf: (segments at: numSegments - 1))!

1 0

VM Maker: VMMaker.oscog-eem.728.mcz
by commits＠source.squeak.org 21 May '14

21 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.728.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.728 Author: eem Time: 21 May 2014, 11:01:45.177 am UUID: 706ecf52-7165-4829-bfb3-8a9ac4f29216 Ancestors: VMMaker.oscog-eem.727 Spur: Implement memory shrinkage. Check free space around SpurSegmentManager prepareForSnapshot & postSnapshot. =============== Diff against VMMaker.oscog-eem.727 =============== Item was changed: ----- Method: SpurMemoryManager>>garbageCollectForSnapshot (in category 'snapshot') ----- garbageCollectForSnapshot self flushNewSpace. "There is no place to put newSpace in the snapshot file." self fullGC. + segmentManager prepareForSnapshot. + self checkFreeSpace! - segmentManager prepareForSnapshot! Item was added: + ----- Method: SpurMemoryManager>>setLastSegment: (in category 'growing/shrinking memory') ----- + setLastSegment: segInfo + "Update after removing a segment. + Here we cut back endOfMemory if required." + <var: #segInfo type: #'SpurSegmentInfo *'> + | currentEnd | + <var: #currentEnd type: #usqInt> + currentEnd := segInfo segLimit - self bridgeSize. + currentEnd <= endOfMemory ifTrue: + [endOfMemory := currentEnd. + freeOldSpaceStart > currentEnd ifTrue: + [freeOldSpaceStart :=currentEnd]]! Item was changed: ----- Method: SpurMemoryManager>>shrinkObjectMemory: (in category 'growing/shrinking memory') ----- + shrinkObjectMemory: delta - shrinkObjectMemory: delta "Attempt to shrink the object memory by the given delta amount." + <doNotGenerate> + segmentManager shrinkObjectMemory: delta! - self cCode: [self print: 'shrinkObjectMemory: shouldBeImplemented'; cr] - inSmalltalk: [self shouldBeImplemented]! Item was changed: ----- Method: SpurMemoryManager>>sqAllocateMemorySegmentOfSize:Above:AllocatedSizeInto: (in category 'simulation only') ----- sqAllocateMemorySegmentOfSize: segmentSize Above: minAddress AllocatedSizeInto: allocSizePtrOrBlock <doNotGenerate> "Simulate heap growth by growing memory by segmentSize + a delta. To test bridges alternate the delta between 0 bytes and 1M bytes depending on the number of segments. The delta will be the distance between segments to be bridged." | delta newMemory start | delta := segmentManager numSegments odd ifTrue: [1024 * 1024] ifFalse: [0]. + "A previous shrink may have freed up memory. Don't bother to grow if there's already room." + segmentManager lastSegment segLimit + segmentSize + delta <= (memory size * 4) ifTrue: + [allocSizePtrOrBlock value: segmentSize. + ^minAddress + delta]. start := memory size * 4 + delta. newMemory := memory class new: memory size + (segmentSize + delta / 4). newMemory replaceFrom: 1 to: memory size with: memory startingAt: 1. memory := newMemory. allocSizePtrOrBlock value: segmentSize. ^start! Item was added: + ----- Method: SpurMemoryManager>>sqDeallocateMemorySegmentAt:ofSize: (in category 'simulation only') ----- + sqDeallocateMemorySegmentAt: startAddress ofSize: ammount + "This is a nop in the simulator." + <doNotGenerate>! Item was added: + ----- Method: SpurSegmentManager>>findEmptySegNearestInSizeTo: (in category 'growing/shrinking memory') ----- + findEmptySegNearestInSizeTo: size + | seg best delta | + <var: #seg type: #'SegmentInfo *'> + best := nil. + delta := size. + 0 to: numSegments - 1 do: + [:i| + seg := self addressOf: (segments at: i). + (self isEmptySegment: seg) ifTrue: + [best + ifNil: [best := seg] + ifNotNil: + [(size >= (seg segSize * 0.75) + and: [(seg segSize - size) abs < delta]) ifTrue: + [best := seg. delta := (seg segSize - size) abs]]]]. + ^best! Item was added: + ----- Method: SpurSegmentManager>>indexOfSegment: (in category 'growing/shrinking memory') ----- + indexOfSegment: seg + <var: #seg type: #'SegmentInfo *'> + 0 to: numSegments - 1 do: + [:i| + seg segStart = (segments at: i) segStart ifTrue: + [^i]]. + self error: 'segment not found'! Item was added: + ----- Method: SpurSegmentManager>>isEmptySegment: (in category 'growing/shrinking memory') ----- + isEmptySegment: seg + <var: #seg type: #'SegmentInfo *'> + | firstObj | + firstObj := manager objectStartingAt: seg segStart. + ^(manager isFreeObject: firstObj) + and: [(manager addressAfter: firstObj) = (seg segLimit - manager bridgeSize)]! Item was added: + ----- Method: SpurSegmentManager>>lastSegment (in category 'accessing') ----- + lastSegment + ^segments at: numSegments - 1! Item was changed: ----- Method: SpurSegmentManager>>postSnapshot (in category 'snapshot') ----- postSnapshot "Restore all shortened segments to their proper size, re-freeing the trailing space." <inline: false> | seg | <var: #seg type: #'SpurSegmentInfo *'> "Set endOfMemory first, to avoid assert fails in freeChunkWithBytes:at:." seg := self addressOf: (segments at: numSegments - 1). seg lastFreeObject ifNil: [self assert: manager endOfMemory = (seg segLimit - manager bridgeSize)] ifNotNil: [manager setEndOfMemory: seg savedSegSize + seg segStart - manager bridgeSize]. numSegments - 1 to: 0 by: -1 do: [:i| seg := self addressOf: (segments at: i). seg lastFreeObject ifNotNil: [:freeChunk| | address | address := seg segLimit - manager bridgeSize. seg segSize: seg savedSegSize. self bridgeFrom: seg to: (i < (numSegments - 1) ifTrue: [self addressOf: (segments at: i + 1)]). manager addFreeChunkWithBytes: seg segLimit - address - manager bridgeSize + at: address]].. + manager checkFreeSpace! - at: address]]! Item was added: + ----- Method: SpurSegmentManager>>removeSegment: (in category 'growing/shrinking memory') ----- + removeSegment: emptySeg + <var: #emptySeg type: #'SpurSegmentInfo *'> + | i | + i := self indexOfSegment: emptySeg. + self assert: i > 0. + + manager sqDeallocateMemorySegmentAt: emptySeg segStart ofSize: emptySeg segSize. + + i to: numSegments - 1 do: + [:j| segments at: j put: (segments at: j + 1)]. + self cCode: [] inSmalltalk: [segments at: numSegments - 1 put: SpurSegmentInfo new]. + numSegments := numSegments - 1. + + self bridgeFrom: (self addressOf: (segments at: i - 1)) + to: (i <= (numSegments - 1) ifTrue: [self addressOf: (segments at: i)]). + + manager setLastSegment: (self addressOf: (segments at: numSegments - 1))! Item was added: + ----- Method: SpurSegmentManager>>shrinkObjectMemory: (in category 'growing/shrinking memory') ----- + shrinkObjectMemory: delta + | shrinkage emptySeg | + <var: #emptySeg type: #'SegmentInfo *'> + shrinkage := delta. + [emptySeg := self findEmptySegNearestInSizeTo: shrinkage. + emptySeg notNil] whileTrue: + [shrinkage := shrinkage - emptySeg segSize. + manager detachFreeObject: (manager objectStartingAt: emptySeg segStart). + self removeSegment: emptySeg]!

1 0

[commit][2924] merge in ARM fast blt code, part II
by commits＠squeakvm.org 21 May '14

21 May '14

Revision: 2924 Author: rowledge Date: 2014-05-20 13:05:16 -0700 (Tue, 20 May 2014) Log Message: ----------- merge in ARM fast blt code, part II Added Paths: ----------- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11Arm.S Added: branches/Cog/platforms/unix/vm-display-X11/sqUnixX11Arm.S =================================================================== --- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11Arm.S (rev 0) +++ branches/Cog/platforms/unix/vm-display-X11/sqUnixX11Arm.S 2014-05-20 20:05:16 UTC (rev 2924) @@ -0,0 +1,246 @@ +; +; Copyright © 2013 Raspberry Pi Foundation +; Copyright © 2013 RISC OS Open Ltd +; +; Permission to use, copy, modify, distribute, and sell this software and its +; documentation for any purpose is hereby granted without fee, provided that +; the above copyright notice appear in all copies and that both that +; copyright notice and this permission notice appear in supporting +; documentation, and that the name of the copyright holders not be used in +; advertising or publicity pertaining to distribution of the software without +; specific, written prior permission. The copyright holders make no +; representations about the suitability of this software for any purpose. It +; is provided "as is" without express or implied warranty. +; +; THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +; SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +; FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +; SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +; WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +; AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +; OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +; SOFTWARE. +; + +; Debug options + GBLL DebugData +;DebugData SETL {TRUE} + GBLL DebugPld +;DebugPld SETL {TRUE} + GBLL VerboseBuild +;VerboseBuild SETL {TRUE} + + GET BitBltArmSimdAsm.hdr + + AREA |sqUnixX11Arm$$Code|, CODE, READONLY + ARM + +; ******************************************************************** + + MACRO + Convert_x888_8_LEPacking_1pixel $src, $dst + AND $dst, ht, $src, LSR #6 ; 00000000000000rrr0000000000000bb + AND $src, $src, #&E000 ; 0000000000000000ggg0000000000000 + ORR $dst, $dst, $dst, LSR #10 ; 00000000000000rrr0000000rrr000bb + ORR $dst, $dst, $src, LSR #11 ; 00000000000000rrr0000000rrrgggbb + AND $dst, $dst, #&FF ; 000000000000000000000000rrrgggbb + LDR $dst, [map, $dst, LSL #2] + MEND + + MACRO + Convert_x888_8_LEPacking_4pixels $src0, $src1, $src2, $src3, $dst + Convert_x888_8_LEPacking_1pixel $src0, $dst + Convert_x888_8_LEPacking_1pixel $src1, $src0 + Convert_x888_8_LEPacking_1pixel $src2, $src1 + Convert_x888_8_LEPacking_1pixel $src3, $src2 + ORR $dst, $dst, $src0, LSL #8 + ORR $dst, $dst, $src1, LSL #16 + ORR $dst, $dst, $src2, LSL #24 + MEND + + MACRO + Convert_x888_8_LEPacking32_8_init + LDR ht, =&38003 + B %FT00 + LTORG +00 + MEND + + MACRO + Convert_x888_8_LEPacking32_8_8bits $src, $dst, $fixed_skew + ; This code should never be executed. It's for handling stray + ; pixels at the start or end of the row, but for now the + ; assembler framework only supports packing these big-endian + ; into words, which isn't what we want. + MEND + + MACRO + Convert_x888_8_LEPacking32_8_16bits $src, $dst, $fixed_skew + ; This code should never be executed. It's for handling stray + ; pixels at the start or end of the row, but for now the + ; assembler framework only supports packing these big-endian + ; into words, which isn't what we want. + MEND + + MACRO + Convert_x888_8_LEPacking32_8_32bits $src, $dst, $fixed_skew + Read4Words src, 4, carry, $fixed_skew, skew, unused + Convert_x888_8_LEPacking_4pixels $wk4, $wk5, $wk6, $wk7, $wk0 + Write1Word dst, 0 + MEND + + MACRO + Convert_x888_8_LEPacking32_8_64bits $src, $fixed_skew + Read4Words src, 4, carry, $fixed_skew, skew, unused + Convert_x888_8_LEPacking_4pixels $wk4, $wk5, $wk6, $wk7, $wk0 + Read4Words src, 4, carry, $fixed_skew, skew, unused + Convert_x888_8_LEPacking_4pixels $wk4, $wk5, $wk6, $wk7, $wk1 + Write2Words dst, 0 + MEND + + MACRO + Convert_x888_8_LEPacking32_8_128bits_head $src, $fixed_skew, $intra_preloads + Read4Words src, 4, carry, $fixed_skew, skew, unused + Convert_x888_8_LEPacking_4pixels $wk4, $wk5, $wk6, $wk7, $wk0 + Read4Words src, 4, carry, $fixed_skew, skew, unused + [ "$intra_preloads" <> "" + PreloadMiddle + ] + Convert_x888_8_LEPacking_4pixels $wk4, $wk5, $wk6, $wk7, $wk1 + Read4Words src, 4, carry, $fixed_skew, skew, unused + Convert_x888_8_LEPacking_4pixels $wk4, $wk5, $wk6, $wk7, $wk2 + Read4Words src, 4, carry, $fixed_skew, skew, unused + MEND + + MACRO + Convert_x888_8_LEPacking32_8_128bits_tail $src + Convert_x888_8_LEPacking_4pixels $wk4, $wk5, $wk6, $wk7, $wk3 + Write4Words dst, 0 + MEND + +;$op GenerateFunctions $src_bpp, $dst_w_bpp, $qualifier, $flags, $prefetch_distance, +; $work_regs, $line_saved_regs, $leading_pixels_reg, $preload_offset_reg, $init, $newline, $cleanup + +Convert_x888_8_LEPacking GenerateFunctions 32, 8,, \ + FLAG_COLOUR_MAP :OR: FLAG_DST_WRITEONLY :OR: FLAG_SPILL_LINE_VARS, 3, \ + "y,stride_d,stride_s,ht_info,bitptrs,skew,orig_w,carry", \ + "x,y,stride_d,stride_s", ht_info,, init ; leading_pixels_reg = wk3 + +; ******************************************************************** + + MACRO + Convert_x888_0565_LEPacking_2pixels $src0, $src1, $dst + AND $dst, ht, $src1, LSR #3 ; 00000000000rrrrr00000000000bbbbb + AND $src1, $src1, #&FC00 ; 0000000000000000gggggg0000000000 + ORR $dst, $dst, $dst, LSR #5 ; 00000000000rrrrrrrrrr000000bbbbb + ORR $src1, $dst, $src1, LSR #5 ; 00000000000rrrrrrrrrrggggggbbbbb + AND $dst, ht, $src0, LSR #3 ; 00000000000RRRRR00000000000BBBBB + AND $src0, $src0, #&FC00 ; 0000000000000000GGGGGG0000000000 + ORR $dst, $dst, $dst, LSR #5 ; 00000000000RRRRRRRRRR000000BBBBB + ORR $src0, $dst, $src0, LSR #5 ; 00000000000RRRRRRRRRRGGGGGGBBBBB + BIC $src0, $src0, #&1F0000 ; 0000000000000000RRRRRGGGGGGBBBBB + ORR $dst, $src0, $src1, LSL #16 ; rrrrrggggggbbbbbRRRRRGGGGGGBBBBB + MEND + + MACRO + Convert_x888_0565_LEPacking32_16_init + LDR ht, =&001F001F + B %FT00 + LTORG +00 + MEND + + MACRO + Convert_x888_0565_LEPacking32_16_16bits $src, $dst, $fixed_skew + ; This code should never be executed. It's for handling stray + ; pixels at the start or end of the row, but for now the + ; assembler framework only supports packing these big-endian + ; into words, which isn't what we want. + MEND + + MACRO + Convert_x888_0565_LEPacking32_16_32bits $src, $dst, $fixed_skew + Read2Words src, 3, carry, $fixed_skew, skew, unused + Convert_x888_0565_LEPacking_2pixels $wk3, $wk4, $wk0 + Write1Word dst, 0 + MEND + + MACRO + Convert_x888_0565_LEPacking32_16_64bits $src, $fixed_skew + Read4Words src, 3, carry, $fixed_skew, skew, unused + Convert_x888_0565_LEPacking_2pixels $wk3, $wk4, $wk0 + Convert_x888_0565_LEPacking_2pixels $wk5, $wk6, $wk1 + Write2Words dst, 0 + MEND + + MACRO + Convert_x888_0565_LEPacking32_16_128bits_head $src, $fixed_skew, $intra_preloads + Read4Words src, 3, carry, $fixed_skew, skew, unused + Convert_x888_0565_LEPacking_2pixels $wk3, $wk4, $wk0 + Convert_x888_0565_LEPacking_2pixels $wk5, $wk6, $wk1 + Read4Words src, 3, carry, $fixed_skew, skew, unused + MEND + + MACRO + Convert_x888_0565_LEPacking32_16_128bits_tail $src + Convert_x888_0565_LEPacking_2pixels $wk3, $wk4, $wk2 + Convert_x888_0565_LEPacking_2pixels $wk5, $wk6, $wk3 + Write4Words dst, 0 + MEND + +;$op GenerateFunctions $src_bpp, $dst_w_bpp, $qualifier, $flags, $prefetch_distance, +; $work_regs, $line_saved_regs, $leading_pixels_reg, $preload_offset_reg, $init, $newline, $cleanup + +Convert_x888_0565_LEPacking GenerateFunctions 32, 16,, \ + FLAG_DST_WRITEONLY :OR: FLAG_SPILL_LINE_VARS, 3, \ + "stride_s,ht_info,map,bitptrs,skew,orig_w,carry", \ + "x,stride_s", map, scratch, init ; leading_pixels_reg = wk2 + +; ******************************************************************** + + MACRO + Convert_x888_x888BGR_LEPacking32_32_32bits $src, $dst, $fixed_skew + SETEND BE + Read1Word src, 0, carry, $fixed_skew, skew, unused + SETEND LE + MOV $wk0, $wk0, LSR #8 + Write1Word dst, 0 + MEND + + MACRO + Convert_x888_x888BGR_LEPacking32_32_64bits $src, $fixed_skew + SETEND BE + Read2Words src, 0, carry, $fixed_skew, skew, unused + SETEND LE + MOV $wk0, $wk0, LSR #8 + MOV $wk1, $wk1, LSR #8 + Write2Words dst, 0 + MEND + + MACRO + Convert_x888_x888BGR_LEPacking32_32_128bits_head $src, $fixed_skew, $intra_preloads + SETEND BE + Read4Words src, 0, carry, $fixed_skew, skew, unused + MEND + + MACRO + Convert_x888_x888BGR_LEPacking32_32_128bits_tail $src + SETEND LE + MOV $wk0, $wk0, LSR #8 + MOV $wk1, $wk1, LSR #8 + MOV $wk2, $wk2, LSR #8 + MOV $wk3, $wk3, LSR #8 + Write4Words dst, 0 + MEND + +;$op GenerateFunctions $src_bpp, $dst_w_bpp, $qualifier, $flags, $prefetch_distance, +; $work_regs, $line_saved_regs, $leading_pixels_reg, $preload_offset_reg, $init, $newline, $cleanup + +Convert_x888_x888BGR_LEPacking GenerateFunctions 32, 32,, \ + FLAG_DST_WRITEONLY, 2, \ + "ht,ht_info,map,bitptrs", \ + "", skew, scratch + +; ******************************************************************** + + END

2 1

InternetConfigPlugin and cmake
by gettimothy 21 May '14

21 May '14

Hi All. I am migrating the Pharo configs for cmake over to the squeak compatibility side and for the StackVM raspberry stuff, there is a plugin that exists on the pharo platform ./platforms/unix/plugins/InternetConfigPlugin that does not exist on the svn co of Cog, I am commenting it out as a required plugin for now, but if it is needed for raspberry stuff we will have to figure something out. cheers. tty

4 4

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.724.mcz
by David T. Lewis 21 May '14

21 May '14

On Tue, May 20, 2014 at 12:15:35PM +0000, commits(a)source.squeak.org wrote: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.724.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.724 > Author: eem > Time: 20 May 2014, 5:14:34.356 am > UUID: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 > Ancestors: VMMaker.oscog-eem.723 > > Slang/general: > VMBIGENDIAN must *not* be defined during generation. It > should be taken from platforms/??/vm/sqConfig.h. This should > go a long way to fixing Doug's issues on PPC. > For sure VMBIGENDIAN should not be generated from slang. But more generally, it is available at runtime via Interpreter>>isBigEnder, so the declaration in sqConfig.h should not be required either. Dave

2 1

[commit][2927] CogVM source as per VMMaker.oscog-eem.727
by commits＠squeakvm.org 21 May '14

21 May '14

Revision: 2927 Author: eliot Date: 2014-05-20 15:55:52 -0700 (Tue, 20 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.727 Spur: Fix assert regression in allInstances/allObject from introducing MarkObjectsForEnumerationPrimitives=false Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - StackToRegisterMappingCogit VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + StackToRegisterMappingCogit VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2219,7 +2219,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.724"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.727"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -15862,9 +15862,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -15905,9 +15903,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -15937,9 +15933,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -16137,9 +16131,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -16178,9 +16170,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -16208,9 +16198,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2222,7 +2222,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.724"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.727"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -15871,9 +15871,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -15914,9 +15912,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -15946,9 +15942,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -16146,9 +16140,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -16187,9 +16179,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -16217,9 +16207,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspursrc/vm/interp.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspursrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspursrc/vm/vmCallback.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - StackInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2009,7 +2009,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.724"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.727"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -14884,9 +14884,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -14927,9 +14925,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -14959,9 +14955,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -15159,9 +15153,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -15200,9 +15192,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -15230,9 +15220,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - StackInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2006,7 +2006,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.724"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.727"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -14875,9 +14875,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -14918,9 +14916,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -14950,9 +14946,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -15150,9 +15144,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -15191,9 +15183,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -15221,9 +15211,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/nsspurstacksrc/vm/interp.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue May 20 15:02:52 PDT 2014 + Tue May 20 15:55:19 PDT 2014 Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ Modified: branches/Cog/spursistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursistasrc/vm/cogmethod.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursistasrc/vm/cogmethod.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ typedef struct { Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2214,7 +2214,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.724]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.727]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11283,9 +11283,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -11326,9 +11324,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11358,9 +11354,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11558,9 +11552,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -11599,9 +11591,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11629,9 +11619,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2217,7 +2217,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.724]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.727]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11292,9 +11292,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -11335,9 +11333,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11367,9 +11363,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11567,9 +11561,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -11608,9 +11600,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11638,9 +11628,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/spursistasrc/vm/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursistasrc/vm/interp.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursistasrc/vm/vmCallback.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursrc/vm/cogit.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - StackToRegisterMappingCogit VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + StackToRegisterMappingCogit VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursrc/vm/cogit.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursrc/vm/cogmethod.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ typedef struct { Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursrc/vm/cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2209,7 +2209,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.724]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.727]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5400,7 +5400,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l148; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5415,7 +5414,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - null; + /* return self */ l148: /* end baseFrameReturn */; goto l145; } @@ -11279,9 +11278,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -11322,9 +11319,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11354,9 +11349,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11554,9 +11547,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -11595,9 +11586,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11625,9 +11614,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursrc/vm/cointerp.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2212,7 +2212,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.724]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.727]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5409,7 +5409,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l148; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5424,7 +5423,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - null; + /* return self */ l148: /* end baseFrameReturn */; goto l145; } @@ -11288,9 +11287,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -11331,9 +11328,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11363,9 +11358,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11563,9 +11556,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -11604,9 +11595,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -11634,9 +11623,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursrc/vm/interp.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spursrc/vm/vmCallback.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - StackInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2002,7 +2002,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.724]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.727]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -10441,9 +10441,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -10484,9 +10482,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -10516,9 +10512,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -10716,9 +10710,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -10757,9 +10749,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -10787,9 +10777,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 from - StackInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1999,7 +1999,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.724]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.727]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -10432,9 +10432,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -10475,9 +10473,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -10507,9 +10503,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -10707,9 +10701,7 @@ } } else { - if (!(((longAt(objOop1)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop1, 0); - } + ; } } @@ -10748,9 +10740,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } @@ -10778,9 +10768,7 @@ } } else { - if (!(((longAt(objOop)) & 0x3FFFFF) == 3)) { - setIsMarkedOfto(objOop, 0); - } + ; } } Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spurstacksrc/vm/interp.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-05-20 22:03:26 UTC (rev 2926) +++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-05-20 22:55:52 UTC (rev 2927) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.727.mcz
by commits＠source.squeak.org 21 May '14

21 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.727.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.727 Author: eem Time: 20 May 2014, 3:35:12.063 pm UUID: c4880b9d-5eff-44bc-8908-a6e831764659 Ancestors: VMMaker.oscog-eem.726 Spur: Fix assert regression in allInsyances/allObject from introducing MarkObjectsForEnumerationPrimitives=false =============== Diff against VMMaker.oscog-eem.726 =============== Item was changed: ----- Method: SpurMemoryManager>>allInstancesOf: (in category 'primitive support') ----- allInstancesOf: aClass "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of instances as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | classIndex freeChunk ptr start limit count bytes | classIndex := self rawHashBitsOf: aClass. (classIndex = 0 or: [aClass ~~ (self classOrNilAtIndex: classIndex)]) ifTrue: [freeChunk := self allocateSlots: 0 format: self arrayFormat classIndex: ClassArrayCompactIndex. ^freeChunk]. MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (MarkObjectsForEnumerationPrimitives ifTrue: [self isMarked: obj] ifFalse: [true]) ifTrue: [(self isNormalObject: obj) ifTrue: [MarkObjectsForEnumerationPrimitives ifTrue: [self setIsMarkedOf: obj to: false]. (self classIndexOf: obj) = classIndex ifTrue: [count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerSlot]]] ifFalse: + [MarkObjectsForEnumerationPrimitives ifTrue: + [(self isSegmentBridge: obj) ifFalse: + [self setIsMarkedOf: obj to: false]]]]]. - [(self isSegmentBridge: obj) ifFalse: - [self setIsMarkedOf: obj to: false]]]]. self assert: self allObjectsUnmarked. self assert: (self isEmptyObjStack: markStack). self emptyObjStack: weaklingStack. (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeObject: freeChunk. ^self integerObjectOf: count]. count < self numSlotsMask ifTrue: [| smallObj | smallObj := self allocateSlots: count format: self arrayFormat classIndex: ClassArrayCompactIndex. 0 to: count - 1 do: [:i| self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofObject: freeChunk)]. self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self beRootIfOld: smallObj. self checkFreeSpace. ^smallObj]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>allObjects (in category 'primitive support') ----- allObjects "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of objects as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | freeChunk ptr start limit count bytes | MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (MarkObjectsForEnumerationPrimitives ifTrue: [self isMarked: obj] ifFalse: [true]) ifTrue: [(self isNormalObject: obj) ifTrue: [MarkObjectsForEnumerationPrimitives ifTrue: [self setIsMarkedOf: obj to: false]. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerSlot]] ifFalse: + [MarkObjectsForEnumerationPrimitives ifTrue: + [(self isSegmentBridge: obj) ifFalse: + [self setIsMarkedOf: obj to: false]]]]]. - [(self isSegmentBridge: obj) ifFalse: - [self setIsMarkedOf: obj to: false]]]]. self assert: self allObjectsUnmarked. self assert: (self isEmptyObjStack: markStack). self emptyObjStack: weaklingStack. self assert: count >= self numSlotsMask. (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk !

1 0

[commit][2926] CogVM source as per VMMaker.oscog-eem.726
by commits＠squeakvm.org 21 May '14

21 May '14

Revision: 2926 Author: eliot Date: 2014-05-20 15:03:26 -0700 (Tue, 20 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.726 Now Spur's object representation implements genInnerPrimitiveMirrorNew[WithArg]: we need defaults for the generic object representation in the Newspeak Cog VM. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-05-20 21:28:29 UTC (rev 2925) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-05-20 22:03:26 UTC (rev 2926) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 from - StackToRegisterMappingCogit VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + StackToRegisterMappingCogit VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -664,6 +664,8 @@ static sqInt genInnerPrimitiveCharacterValue(sqInt retNOffset) NoDbgRegParms; static sqInt genInnerPrimitiveIdenticalorNotIf(sqInt retNoffset, sqInt orNot) NoDbgRegParms; static sqInt genInnerPrimitiveIdentityHash(sqInt retNOffset) NoDbgRegParms; +static sqInt genInnerPrimitiveMirrorNewWithArg(sqInt retNoffset) NoDbgRegParms; +static sqInt genInnerPrimitiveMirrorNew(sqInt retNoffset) NoDbgRegParms; static sqInt genInnerPrimitiveNewMethod(sqInt retNoffset) NoDbgRegParms; static sqInt genInnerPrimitiveNewWithArg(sqInt retNoffset) NoDbgRegParms; static sqInt genInnerPrimitiveNew(sqInt retNoffset) NoDbgRegParms; @@ -13071,6 +13073,24 @@ /* subclasses override if they can */ static sqInt +genInnerPrimitiveMirrorNewWithArg(sqInt retNoffset) +{ + return unimplementedPrimitive(); +} + + +/* subclasses override if they can */ + +static sqInt +genInnerPrimitiveMirrorNew(sqInt retNoffset) +{ + return unimplementedPrimitive(); +} + + +/* subclasses override if they can */ + +static sqInt genInnerPrimitiveNewMethod(sqInt retNoffset) { return unimplementedPrimitive(); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-05-20 21:28:29 UTC (rev 2925) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-05-20 22:03:26 UTC (rev 2926) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-20 21:28:29 UTC (rev 2925) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-20 22:03:26 UTC (rev 2926) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGenerator VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue May 20 14:27:38 PDT 2014 + Tue May 20 15:02:52 PDT 2014

1 0

VM Maker: VMMaker.oscog-eem.726.mcz
by commits＠source.squeak.org 21 May '14

21 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.726.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.726 Author: eem Time: 20 May 2014, 2:59:30.34 pm UUID: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 Ancestors: VMMaker.oscog-eem.725 Now Spur's object representation implements genInnerPrimitiveMirrorNew[WithArg]: we need defaults for the generic object representation =============== Diff against VMMaker.oscog-eem.725 =============== Item was added: + ----- Method: CogObjectRepresentation>>genInnerPrimitiveMirrorNew: (in category 'primitive generators') ----- + genInnerPrimitiveMirrorNew: retNoffset + <option: #NewspeakVM> + "subclasses override if they can" + ^cogit unimplementedPrimitive! Item was added: + ----- Method: CogObjectRepresentation>>genInnerPrimitiveMirrorNewWithArg: (in category 'primitive generators') ----- + genInnerPrimitiveMirrorNewWithArg: retNoffset + <option: #NewspeakVM> + "subclasses override if they can" + ^cogit unimplementedPrimitive!

1 0

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