Vm-dev January 2013

vm-dev@lists.squeakfoundation.org

27 participants
148 discussions

VM Maker: VMMaker.oscog-eem.250.mcz
by commits＠source.squeak.org 07 Jan '13

07 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.250.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.250 Author: eem Time: 7 January 2013, 1:30:28.165 pm UUID: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 Ancestors: VMMaker.oscog-eem.249 Improve absent receiver send marshalling to only shuffled currently spilled args. Revert rush-of-blood-to-the-head change to ceImplicitReceiver trampoline, but use Arg1Reg rather than Arg0Reg. Fix (old) bug in ssAllocateRequiredRegMask:upThrough: that would flush entire stack if allocating any register. =============== Diff against VMMaker.oscog-eem.249 =============== Item was changed: ----- Method: Cogit>>generateNewspeakRuntime (in category 'initialization') ----- generateNewspeakRuntime <option: #NewspeakVM> | jumpMiss jumpItsTheReceiverStupid | <var: #jumpMiss type: #'AbstractInstruction *'> <var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'> "Generate the non-send runtime support for Newspeak, explicit outer and implicit receiver. The dynamic frequency of explicit outer is so low we merely call an interpreter routine." ceExplicitReceiverTrampoline := self genTrampolineFor: #ceExplicitReceiverAt: called: 'ceExplicitReceiverTrampoline' arg: SendNumArgsReg result: ReceiverResultReg. "Cached push implicit receiver implementation. Caller looks like mov selector, ClassReg call ceImplicitReceiver br continue Lclass: .word Lmixin:: .word continue: If class matches class of receiver then mixin contains either 0 or the implicit receiver. If 0, answer the actual receiver, otherwise the mixin. + Generate the class fetch and cache probe inline for speed. Smashes Arg0Reg and caller-saved regs." - Generate the class fetch and cache probe inline for speed. Smashes caller-saved regs." opcodeIndex := 0. self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. objectRepresentation genGetClassObjectOf: ReceiverResultReg into: ClassReg scratchReg: TempReg. + self MoveMw: 0 r: SPReg R: TempReg. + self MoveMw: backEnd jumpShortByteSize r: TempReg R: Arg1Reg. + self CmpR: ClassReg R: Arg1Reg. - self MoveMw: 0 r: SPReg R: TempReg. "get return address..." - self MoveMw: backEnd jumpShortByteSize r: TempReg R: ReceiverResultReg. "get cached class..." - self CmpR: ClassReg R: ReceiverResultReg. jumpMiss := self JumpNonZero: 0. self MoveMw: backEnd jumpShortByteSize + BytesPerOop r: TempReg R: ClassReg. self CmpCq: 0 R: ClassReg. jumpItsTheReceiverStupid := self JumpZero: 0. self MoveR: ClassReg R: ReceiverResultReg. jumpItsTheReceiverStupid jmpTarget: (self RetN: 0). jumpMiss jmpTarget: self Label. ceImplicitReceiverTrampoline := self genTrampolineFor: #ceImplicitReceiverFor:receiver:class: called: 'ceImplicitReceiverTrampoline' callJumpBar: true numArgs: 3 arg: SendNumArgsReg arg: ReceiverResultReg arg: ClassReg arg: nil saveRegs: false resultReg: ReceiverResultReg appendOpcodes: true! Item was changed: ----- Method: StackToRegisterMappingCogit>>genGetImplicitReceiverFor: (in category 'bytecode generators') ----- genGetImplicitReceiverFor: selector "Cached implicit receiver implementation. Caller looks like mov selector, ClassReg call cePushImplicitReceiver br continue Lclass .word Lmixin: .word continue: If class matches class of receiver then mixin contains either 0 or the implicit receiver. If 0, answer the actual receiver. This is done in the trampoline. See generateNewspeakRuntime." + self ssAllocateCallReg: SendNumArgsReg and: ReceiverResultReg and: ClassReg and: Arg1Reg. - self ssAllocateCallReg: SendNumArgsReg and: ReceiverResultReg and: ClassReg. ^super genGetImplicitReceiverFor: selector! Item was changed: ----- Method: StackToRegisterMappingCogit>>marshallImplicitReceiverSendArguments: (in category 'simulation stack') ----- marshallImplicitReceiverSendArguments: numArgs "Spill everything on the simulated stack that needs spilling (that below arguments). Marshall arguments to stack and/or registers depending on arg count. If the args don't fit in registers push receiver and args (spill everything). Assume receiver already in ResultReceiverReg so shuffle args and push it if necessary." numArgs > self numRegArgs ifTrue: ["The arguments must be pushed to the stack, and hence the receiver + must be inserted beneath the args. Reduce or eliminate the argument + shuffle by only moving already spilled items." + | numSpilled | + numSpilled := self numberOfSpillsInTopNItems: numArgs. + numSpilled > 0 - must be inserted beneath the args. If nothing has been spilled first - avoid the argument shuffle by pushing ReceiverResultReg first." - (self noSpillsInTopNItems: numArgs) ifTrue: + [self MoveMw: 0 r: SPReg R: TempReg. - [self PushR: ReceiverResultReg. - self ssFlushTo: simStackPtr] - ifFalse: - [self ssFlushTo: simStackPtr. - self MoveMw: 0 r: SPReg R: TempReg. self PushR: TempReg. + 2 to: numSpilled do: - 2 to: numArgs do: [:index| self MoveMw: index * BytesPerWord r: SPReg R: TempReg. self MoveR: TempReg Mw: index - 1 * BytesPerWord r: SPReg]. + self MoveR: ReceiverResultReg Mw: numSpilled * BytesPerWord r: SPReg] + ifFalse: + [self PushR: ReceiverResultReg]. + self ssFlushTo: simStackPtr] - self MoveR: ReceiverResultReg Mw: numArgs * BytesPerWord r: SPReg]] "Move the args to the register arguments, being careful to do so last to first so e.g. previous contents don't get overwritten. Also check for any arg registers in use by other args." ifFalse: [self ssFlushTo: simStackPtr - numArgs - 1. numArgs > 0 ifTrue: [(self numRegArgs > 1 and: [numArgs > 1]) ifTrue: [self ssAllocateRequiredReg: Arg0Reg upThrough: simStackPtr - 2. self ssAllocateRequiredReg: Arg1Reg upThrough: simStackPtr - 1] ifFalse: [self ssAllocateRequiredReg: Arg0Reg upThrough: simStackPtr - 1]]. (self numRegArgs > 1 and: [numArgs > 1]) ifTrue: [(self simStackAt: simStackPtr) popToReg: Arg1Reg]. numArgs > 0 ifTrue: [(self simStackAt: simStackPtr - numArgs + 1) popToReg: Arg0Reg]]. self ssPop: numArgs! Item was removed: - ----- Method: StackToRegisterMappingCogit>>noSpillsInTopNItems: (in category 'simulation stack') ----- - noSpillsInTopNItems: n - "Answer if the simStack contains no spills in the top n items." - 0 to: n - 1 do: - [:i| (self simStackAt: i) type = SSSpill ifTrue: [^false]]. - ^true! Item was added: + ----- Method: StackToRegisterMappingCogit>>numberOfSpillsInTopNItems: (in category 'simulation stack') ----- + numberOfSpillsInTopNItems: n + simStackPtr to: simStackPtr - n + 1 by: -1 do: + [:i| (self simStackAt: i) type = SSSpill ifTrue: + [^n - (simStackPtr - i)]]. + ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>ssAllocateRequiredRegMask:upThrough: (in category 'simulation stack') ----- ssAllocateRequiredRegMask: requiredRegsMask upThrough: stackPtr | lastRequired liveRegs | lastRequired := -1. "compute live regs while noting the last occurrence of required regs. If these are not free we must spill from simSpillBase to last occurrence. Note we are conservative here; we could allocate FPReg in frameless methods." liveRegs := self registerMaskFor: FPReg and: SPReg. (simSpillBase max: 0) to: stackPtr do: [:i| liveRegs := liveRegs bitOr: (self simStackAt: i) registerMask. + ((self simStackAt: i) registerMask bitAnd: requiredRegsMask) ~= 0 ifTrue: - (liveRegs bitAnd: requiredRegsMask) ~= 0 ifTrue: [lastRequired := i]]. "If any of requiredRegsMask are live we must spill." (liveRegs bitAnd: requiredRegsMask) = 0 ifFalse: ["Some live, must spill" self ssFlushTo: lastRequired. self assert: (self liveRegisters bitAnd: requiredRegsMask) = 0]!

1 0

VM Maker: VMMaker.oscog-eem.249.mcz
by commits＠source.squeak.org 07 Jan '13

07 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.249.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.249 Author: eem Time: 7 January 2013, 9:40:44.287 am UUID: f55f4646-2800-4e27-b885-c25b0eddd43e Ancestors: VMMaker.oscog-eem.248 Implement absent receiver sends in the Cogits. Refactor pushImplicitReceiver into genGetImplicitReceiverFor: and clients and use genGetImplicitReceiverFor: for absent receiver sends. No longer use Arg0Reg in ceImplicitReceiverTrampoline. Fix CurrentImageCoInterpreterFacade for Newspeak methods. Fix initialization of COGMTVM for simulation. =============== Diff against VMMaker.oscog-eem.248 =============== Item was changed: ----- Method: Cogit>>generateNewspeakRuntime (in category 'initialization') ----- generateNewspeakRuntime <option: #NewspeakVM> | jumpMiss jumpItsTheReceiverStupid | <var: #jumpMiss type: #'AbstractInstruction *'> <var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'> "Generate the non-send runtime support for Newspeak, explicit outer and implicit receiver. The dynamic frequency of explicit outer is so low we merely call an interpreter routine." ceExplicitReceiverTrampoline := self genTrampolineFor: #ceExplicitReceiverAt: called: 'ceExplicitReceiverTrampoline' arg: SendNumArgsReg result: ReceiverResultReg. "Cached push implicit receiver implementation. Caller looks like mov selector, ClassReg call ceImplicitReceiver br continue Lclass: .word Lmixin:: .word continue: If class matches class of receiver then mixin contains either 0 or the implicit receiver. If 0, answer the actual receiver, otherwise the mixin. + Generate the class fetch and cache probe inline for speed. Smashes caller-saved regs." - Generate the class fetch and cache probe inline for speed. Smashes Arg0Reg and caller-saved regs." opcodeIndex := 0. self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. objectRepresentation genGetClassObjectOf: ReceiverResultReg into: ClassReg scratchReg: TempReg. + self MoveMw: 0 r: SPReg R: TempReg. "get return address..." + self MoveMw: backEnd jumpShortByteSize r: TempReg R: ReceiverResultReg. "get cached class..." + self CmpR: ClassReg R: ReceiverResultReg. - self MoveMw: 0 r: SPReg R: TempReg. - self MoveMw: backEnd jumpShortByteSize r: TempReg R: Arg0Reg. - self CmpR: ClassReg R: Arg0Reg. jumpMiss := self JumpNonZero: 0. self MoveMw: backEnd jumpShortByteSize + BytesPerOop r: TempReg R: ClassReg. self CmpCq: 0 R: ClassReg. jumpItsTheReceiverStupid := self JumpZero: 0. self MoveR: ClassReg R: ReceiverResultReg. jumpItsTheReceiverStupid jmpTarget: (self RetN: 0). jumpMiss jmpTarget: self Label. ceImplicitReceiverTrampoline := self genTrampolineFor: #ceImplicitReceiverFor:receiver:class: called: 'ceImplicitReceiverTrampoline' callJumpBar: true numArgs: 3 arg: SendNumArgsReg arg: ReceiverResultReg arg: ClassReg arg: nil saveRegs: false resultReg: ReceiverResultReg appendOpcodes: true! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>debugStackPointersFor: (in category 'accessing') ----- debugStackPointersFor: anOop ^CArrayAccessor on: + (((NewspeakVM + ifTrue: [NewspeakStackDepthFinder] + ifFalse: [StackDepthFinder]) on: (objectMap keyAtValue: anOop)) - ((StackDepthFinder on: (objectMap keyAtValue: anOop)) stackPointers)! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>splObj: (in category 'accessing') ----- splObj: splObjIndex ^splObjIndex caseOf: { + [ClassArray] -> [self oopForObject: Array]. + [CompactClasses] -> [self oopForObject: Smalltalk compactClassesArray] + }! - [ClassArray] -> [self oopForObject: Array] }! Item was added: + ----- Method: NewspeakStackDepthFinder>>sendToAbsentImplicitReceiver:numArgs: (in category 'instruction decoding') ----- + sendToAbsentImplicitReceiver: selector numArgs: numArgs + "Send Message With Selector, selector, to dynamic superclass bytecode." + self drop: numArgs - 1 "i.e. if 0 args, pushes a result"! Item was changed: ----- Method: SimpleStackBasedCogit>>genExtSendAbsentImplicitBytecode (in category 'bytecode generators') ----- genExtSendAbsentImplicitBytecode "240 11110000 i i i i i j j j Send To Absent Implicit Receiver Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" + | litIndex nArgs | + litIndex := (byte1 >> 3) + (extA << 5). + extA := 0. + nArgs := (byte1 bitAnd: 7) + (extB << 3). + extB := 0. + ^self genSendAbsentImplicit: (coInterpreter literal: litIndex ofMethod: methodObj) numArgs: nArgs! - self shouldBeImplemented. - ^EncounteredUnknownBytecode! Item was added: + ----- Method: SimpleStackBasedCogit>>genGetImplicitReceiverFor: (in category 'bytecode generators') ----- + genGetImplicitReceiverFor: selector + "Cached implicit receiver implementation. Caller looks like + mov selector, ClassReg + call cePushImplicitReceiver + br continue + Lclass .word + Lmixin: .word + continue: + If class matches class of receiver then mixin contains either 0 or the implicit receiver. + If 0, answer the actual receiver. This is done in the trampoline. + See generateNewspeakRuntime." + | skip | + <var: #skip type: #'AbstractInstruction *'> + (objectMemory isYoung: selector) ifTrue: + [hasYoungReferent := true]. + self assert: needsFrame. + self MoveCw: selector R: SendNumArgsReg. + self CallNewspeakSend: ceImplicitReceiverTrampoline. + skip := self Jump: 0. + self Fill32: 0. + self Fill32: 0. + skip jmpTarget: self Label. + ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPushImplicitReceiverBytecode (in category 'bytecode generators') ----- genPushImplicitReceiverBytecode + | result | + result := self genGetImplicitReceiverFor: (coInterpreter literal: byte1 ofMethod: methodObj). + result ~= 0 ifTrue: + [^result]. + self PushR: ReceiverResultReg. - "Cached push implicit receiver implementation. Caller looks like - mov selector, ClassReg - call cePushImplicitReceiver - br continue - Lclass .word - Lmixin: .word - continue: - If class matches class of receiver then mixin contains either 0 or the implicit receiver. - If 0, push the actual receiver." - | selector skip | - <var: #skip type: #'AbstractInstruction *'> - - selector := coInterpreter literal: byte1 ofMethod: methodObj. - (objectMemory isYoung: selector) ifTrue: - [hasYoungReferent := true]. - self assert: needsFrame. - self MoveCw: selector R: SendNumArgsReg. - self CallNewspeakSend: ceImplicitReceiverTrampoline. - skip := self Jump: 0. - self Fill32: 0. - self Fill32: 0. - skip jmpTarget: (self PushR: ReceiverResultReg). ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genSendAbsentImplicit0ArgsBytecode (in category 'bytecode generators') ----- genSendAbsentImplicit0ArgsBytecode + "160-175 1010 i i i i Send To Absent Implicit Receiver Literal Selector #iiii With 0 Arguments." + ^self genSendAbsentImplicit: (coInterpreter literal: (byte0 bitAnd: 15) ofMethod: methodObj) numArgs: 0! - "160-175 1010 i i i i Send To Absent Implicit Receiver Literal Selector #iiii With 0 Arguments" - self shouldBeImplemented. - ^EncounteredUnknownBytecode! Item was added: + ----- Method: SimpleStackBasedCogit>>genSendAbsentImplicit:numArgs: (in category 'bytecode generators') ----- + genSendAbsentImplicit: selector numArgs: numArgs + "Get the implicit receiver and shuffle arguments if necessary. + Then send." + <inline: false> + | result | + result := self genGetImplicitReceiverFor: selector. + result ~= 0 ifTrue: + [^result]. + numArgs = 0 + ifTrue: + [self PushR: ReceiverResultReg] + ifFalse: + [self MoveMw: 0 r: SPReg R: TempReg. + self PushR: TempReg. + 2 to: numArgs do: + [:index| + self MoveMw: index * BytesPerWord r: SPReg R: TempReg. + self MoveR: TempReg Mw: index - 1 * BytesPerWord r: SPReg]. + "if we copied the code in genSend:numArgs: we could save an instruction. + But we care not; the smarts are in StackToRegisterMappingCogit et al" + self MoveR: ReceiverResultReg Mw: numArgs * BytesPerWord r: SPReg]. + ^self genSend: selector numArgs: numArgs! Item was added: + ----- Method: StackToRegisterMappingCogit>>genGetImplicitReceiverFor: (in category 'bytecode generators') ----- + genGetImplicitReceiverFor: selector + "Cached implicit receiver implementation. Caller looks like + mov selector, ClassReg + call cePushImplicitReceiver + br continue + Lclass .word + Lmixin: .word + continue: + If class matches class of receiver then mixin contains either 0 or the implicit receiver. + If 0, answer the actual receiver. This is done in the trampoline. + See generateNewspeakRuntime." + self ssAllocateCallReg: SendNumArgsReg and: ReceiverResultReg and: ClassReg. + ^super genGetImplicitReceiverFor: selector! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPushImplicitReceiverBytecode (in category 'bytecode generators') ----- genPushImplicitReceiverBytecode + | result | + result := self genGetImplicitReceiverFor: (coInterpreter literal: byte1 ofMethod: methodObj). + result ~= 0 ifTrue: + [^result]. - "Cached push implicit receiver implementation. Caller looks like - mov selector, ClassReg - call cePushImplicitReceiver - br continue - Lclass .word - Lmixin: .word - continue: - If class matches class of receiver then mixin contains either 0 or the implicit receiver. - If 0, push the actual receiver." - | selector skip | - <var: #skip type: #'AbstractInstruction *'> - self ssAllocateCallReg: SendNumArgsReg and: ReceiverResultReg and: ClassReg and: Arg0Reg. - selector := coInterpreter literal: byte1 ofMethod: methodObj. - (objectMemory isYoung: selector) ifTrue: - [hasYoungReferent := true]. - self assert: needsFrame. - self MoveCw: selector R: SendNumArgsReg. - self CallNewspeakSend: ceImplicitReceiverTrampoline. - skip := self Jump: 0. - self Fill32: 0. - self Fill32: 0. - skip jmpTarget: self Label. ^self ssPushRegister: ReceiverResultReg! Item was added: + ----- Method: StackToRegisterMappingCogit>>genSendAbsentImplicit:numArgs: (in category 'bytecode generators') ----- + genSendAbsentImplicit: selector numArgs: numArgs + "Get the implicit receiver and marshall arguments, shuffling the + stack to push the implicit receiver if necessary. Then send." + <inline: false> + | result | + result := self genGetImplicitReceiverFor: selector. + result ~= 0 ifTrue: + [^result]. + self marshallImplicitReceiverSendArguments: numArgs. + ^self genMarshalledSend: selector numArgs: numArgs! Item was added: + ----- Method: StackToRegisterMappingCogit>>marshallImplicitReceiverSendArguments: (in category 'simulation stack') ----- + marshallImplicitReceiverSendArguments: numArgs + "Spill everything on the simulated stack that needs spilling (that below arguments). + Marshall arguments to stack and/or registers depending on arg count. + If the args don't fit in registers push receiver and args (spill everything). Assume + receiver already in ResultReceiverReg so shuffle args and push it if necessary." + numArgs > self numRegArgs + ifTrue: + ["The arguments must be pushed to the stack, and hence the receiver + must be inserted beneath the args. If nothing has been spilled first + avoid the argument shuffle by pushing ReceiverResultReg first." + (self noSpillsInTopNItems: numArgs) + ifTrue: + [self PushR: ReceiverResultReg. + self ssFlushTo: simStackPtr] + ifFalse: + [self ssFlushTo: simStackPtr. + self MoveMw: 0 r: SPReg R: TempReg. + self PushR: TempReg. + 2 to: numArgs do: + [:index| + self MoveMw: index * BytesPerWord r: SPReg R: TempReg. + self MoveR: TempReg Mw: index - 1 * BytesPerWord r: SPReg]. + self MoveR: ReceiverResultReg Mw: numArgs * BytesPerWord r: SPReg]] + "Move the args to the register arguments, being careful to do + so last to first so e.g. previous contents don't get overwritten. + Also check for any arg registers in use by other args." + ifFalse: + [self ssFlushTo: simStackPtr - numArgs - 1. + numArgs > 0 ifTrue: + [(self numRegArgs > 1 and: [numArgs > 1]) + ifTrue: + [self ssAllocateRequiredReg: Arg0Reg upThrough: simStackPtr - 2. + self ssAllocateRequiredReg: Arg1Reg upThrough: simStackPtr - 1] + ifFalse: + [self ssAllocateRequiredReg: Arg0Reg upThrough: simStackPtr - 1]]. + (self numRegArgs > 1 and: [numArgs > 1]) ifTrue: + [(self simStackAt: simStackPtr) popToReg: Arg1Reg]. + numArgs > 0 ifTrue: + [(self simStackAt: simStackPtr - numArgs + 1) + popToReg: Arg0Reg]]. + self ssPop: numArgs! Item was added: + ----- Method: StackToRegisterMappingCogit>>noSpillsInTopNItems: (in category 'simulation stack') ----- + noSpillsInTopNItems: n + "Answer if the simStack contains no spills in the top n items." + 0 to: n - 1 do: + [:i| (self simStackAt: i) type = SSSpill ifTrue: [^false]]. + ^true! Item was changed: ----- Method: VMClass class>>initializeMiscConstantsWith: (in category 'initialization') ----- initializeMiscConstantsWith: optionsDictionary "Falsify the `what type of VM is this?' flags that are defined in the various interp.h files, or in the case of VMBIGENDIAN the various sqConfig.h files. Subclass implementations need to include a super initializeMiscConstantsWith:." VMBIGENDIAN class. "Mention this for the benefit of CCodeGenerator>>emitCConstantsOn:" self isInterpreterClass ifTrue: [STACKVM := COGVM := COGMTVM := false]. NewspeakVM := optionsDictionary at: #NewspeakVM ifAbsent: [false]. MULTIPLEBYTECODESETS := optionsDictionary at: #MULTIPLEBYTECODESETS ifAbsent: [false]. "N.B. Not yet implemented." + IMMUTABILITY := optionsDictionary at: #IMMUTABILITY ifAbsent: [false]. + + "These for scripts etc... Usually they should get set by an Interpreter class's initializeMiscConstantsWith:" + (optionsDictionary includesKey: #STACKVM) ifTrue: + [STACKVM := optionsDictionary at: #STACKVM]. + (optionsDictionary includesKey: #COGVM) ifTrue: + [COGVM := optionsDictionary at: #COGVM]. + (optionsDictionary includesKey: #COGMTVM) ifTrue: + [COGMTVM := optionsDictionary at: #COGMTVM]! - IMMUTABILITY := optionsDictionary at: #IMMUTABILITY ifAbsent: [false]!

1 0

OS X equivalent of -vm-sound-null ?
by Frank Shearar 06 Jan '13

06 Jan '13

OS X's VMs use different command line arguments to Linux ones: -headless instead of -vm-display-null, for instance. I can't see what the OS X analogue to -vm-sound-null is though (despite having read the manual/s). Any idea? frank

2 2

Question how to load VMMaker in Squeak image
by Nicolas Cellier 06 Jan '13

06 Jan '13

There is a question on SO... http://stackoverflow.com/questions/14176298/how-to-load-vmmaker-in-squeak David, do you still maintain the update MCM ? Or is there a SqueakMap option? Else you can help a user... Nicolas

3 3

VM Maker: VMMaker-dtl.295.mcz
by commits＠source.squeak.org 05 Jan '13

05 Jan '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.295.mcz ==================== Summary ==================== Name: VMMaker-dtl.295 Author: dtl Time: 5 January 2013, 10:07:04.06 am UUID: 19423e4d-8757-448f-8df5-c3f5d6eb42aa Ancestors: VMMaker-dtl.294 VMMaker 4.10.9 Install primitiveRemLargeIntegers as primitive number 20. Reference http://lists.squeakfoundation.org/pipermail/vm-dev/2013-January/011704.html Primitive 20 is in the range of large integer primitives, and has been unused since at least Squeak 3.6. primitiveRemLargeIntegers should be a numbered primitive consistent with other large integer primitives, so install it as number 20. =============== Diff against VMMaker-dtl.294 =============== Item was changed: ----- Method: Interpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.10.9'! - ^'4.10.8'!

1 0

Issue 116 in cog: "Can't infer base LD_LIBRARY_PATH. Aborting." On Linux Mint Debian Edition Update Pack 6
by cog＠googlecode.com 05 Jan '13

05 Jan '13

Status: New Owner: ---- Labels: Type-Defect Priority-Medium New issue 116 by tobias.p...(a)student.hpi.uni-potsdam.de: "Can't infer base LD_LIBRARY_PATH. Aborting." On Linux Mint Debian Edition Update Pack 6 http://code.google.com/p/cog/issues/detail?id=116 What steps will reproduce the problem? 1. Install Linux Mint Debian Edition with Update Pack 6 2. Try to run './squeak' from the folder where the cogvm and my squeak images reside I would expect squeak to start, as it did before. The problem happens with 4.0-2585 and 4.0-2640 (most up to date version I could get a hold off). I suspect that the problem has got something to do with the multiarch support in update pack 6. Because the return value of ldd ./squeak is now different than the shell script expects. It returns: squeak/lib/squeak/4.0-2640$ ldd ./squeak linux-gate.so.1 => (0xf777c000) libutil.so.1 => /lib/i386-linux-gnu/i686/cmov/libutil.so.1 (0xf7753000) libdl.so.2 => /lib/i386-linux-gnu/i686/cmov/libdl.so.2 (0xf774f000) libpthread.so.0 => /lib/i386-linux-gnu/i686/cmov/libpthread.so.0 (0xf7735000) libm.so.6 => /lib/i386-linux-gnu/i686/cmov/libm.so.6 (0xf770f000) libnsl.so.1 => /lib/i386-linux-gnu/i686/cmov/libnsl.so.1 (0xf76f8000) libc.so.6 => /lib/i386-linux-gnu/i686/cmov/libc.so.6 (0xf7595000) /lib/ld-linux.so.2 (0xf777d000) The libc line is substantially different then what the shell script expects ("/lib/i386-linux-gnu/libc*)"). But a quick fix could do it. As a work around, running the binary directly works like a charm. Cheers

1 0

[commit][2658] Turn off inlining when compiling the Cogit.
by commits＠squeakvm.org 04 Jan '13

04 Jan '13

Revision: 2658 Author: eliot Date: 2013-01-04 12:44:30 -0800 (Fri, 04 Jan 2013) Log Message: ----------- Turn off inlining when compiling the Cogit. The Cogit's runtime is negligible and we prefer to save space. With the recent changes (better shift code??) the VM appears faster anyway. Modified Paths: -------------- branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj 2013-01-04 05:40:05 UTC (rev 2657) +++ branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj 2013-01-04 20:44:30 UTC (rev 2658) @@ -20,7 +20,7 @@ 739C6EDA112DCBD10049B7D3 /* sqAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 739C6ED8112DCBD10049B7D3 /* sqAssert.h */; }; 73B54C530E55EFED00FE780C /* sqUnixVMProfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B54C520E55EFED00FE780C /* sqUnixVMProfile.c */; }; 73B96E490E47D7A10079C51B /* sqUnixHeartbeat.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B96E480E47D7A10079C51B /* sqUnixHeartbeat.c */; }; - 73BC1BBB0F576864003412C5 /* cogit.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB60F576864003412C5 /* cogit.c */; }; + 73BC1BBB0F576864003412C5 /* cogit.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB60F576864003412C5 /* cogit.c */; settings = {COMPILER_FLAGS = "-fno-inline"; }; }; 73BC1BBC0F576864003412C5 /* cogit.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BB70F576864003412C5 /* cogit.h */; }; 73BC1BBD0F576864003412C5 /* cogmethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BB80F576864003412C5 /* cogmethod.h */; }; 73BC1BBE0F576864003412C5 /* gcc3x-cointerpmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB90F576864003412C5 /* gcc3x-cointerpmt.c */; }; Modified: branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2013-01-04 05:40:05 UTC (rev 2657) +++ branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2013-01-04 20:44:30 UTC (rev 2658) @@ -20,7 +20,7 @@ 739C6EDA112DCBD10049B7D3 /* sqAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 739C6ED8112DCBD10049B7D3 /* sqAssert.h */; }; 73B54C530E55EFED00FE780C /* sqUnixVMProfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B54C520E55EFED00FE780C /* sqUnixVMProfile.c */; }; 73B96E490E47D7A10079C51B /* sqUnixHeartbeat.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B96E480E47D7A10079C51B /* sqUnixHeartbeat.c */; }; - 73BC1BBB0F576864003412C5 /* cogit.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB60F576864003412C5 /* cogit.c */; }; + 73BC1BBB0F576864003412C5 /* cogit.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB60F576864003412C5 /* cogit.c */; settings = {COMPILER_FLAGS = "-fno-inline"; }; }; 73BC1BBC0F576864003412C5 /* cogit.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BB70F576864003412C5 /* cogit.h */; }; 73BC1BBD0F576864003412C5 /* cogmethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BB80F576864003412C5 /* cogmethod.h */; }; 73BC1BBE0F576864003412C5 /* gcc3x-cointerp.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB90F576864003412C5 /* gcc3x-cointerp.c */; }; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jan 3 13:56:35 PST 2013 + Fri Jan 4 12:43:14 PST 2013

1 0

[commit][2656] Update sources as per VMMaker-dtl.294
by commits＠squeakvm.org 04 Jan '13

04 Jan '13

Revision: 2656 Author: lewis Date: 2013-01-03 20:55:58 -0800 (Thu, 03 Jan 2013) Log Message: ----------- Update sources as per VMMaker-dtl.294 Add missing comment generation for TStmtListNode to provide additional embedded comments in generated C source. Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/ckformat.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2012-12-29T19:53:02.822-05:00--- */ +/* --- Automatically generated from class ImageFormat 2013-01-03T23:27:08.232-05:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */ Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:53:01 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:07 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -81,9 +81,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 29 December 2012 (i)" + "AioPlugin 3 January 2013 (i)" #else - "AioPlugin 29 December 2012 (e)" + "AioPlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:50 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:04 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -90,9 +90,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 29 December 2012 (i)" + "B3DAcceleratorPlugin 3 January 2013 (i)" #else - "B3DAcceleratorPlugin 29 December 2012 (e)" + "B3DAcceleratorPlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:52 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:05 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 29 December 2012 (i)" + "CameraPlugin 3 January 2013 (i)" #else - "CameraPlugin 29 December 2012 (e)" + "CameraPlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:52 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:05 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -54,9 +54,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 29 December 2012 (i)" + "ClipboardExtendedPlugin 3 January 2013 (i)" #else - "ClipboardExtendedPlugin 29 December 2012 (e)" + "ClipboardExtendedPlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:53 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:05 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -136,9 +136,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 29 December 2012 (i)" + "DBusPlugin 3 January 2013 (i)" #else - "DBusPlugin 29 December 2012 (e)" + "DBusPlugin 3 January 2013 (e)" #endif ; static DBusMessage* writeMessage; @@ -440,6 +440,9 @@ connections[h] = conn; data = newDataStructWithConnectionandSemaphore(conn, semaIndex); if (data != null) { + + /* register watch functions with data */ + if (!(dbus_connection_set_watch_functions( conn, sqDBusPluginAddWatchwithData, Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:54 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:05 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -50,9 +50,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 29 December 2012 (i)" + "FileCopyPlugin 3 January 2013 (i)" #else - "FileCopyPlugin 29 December 2012 (e)" + "FileCopyPlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:55 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:06 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -59,9 +59,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 29 December 2012 (i)" + "HostWindowPlugin 3 January 2013 (i)" #else - "HostWindowPlugin 29 December 2012 (e)" + "HostWindowPlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:58 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:06 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -63,9 +63,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin 29 December 2012 (i)" + "MIDIPlugin 3 January 2013 (i)" #else - "MIDIPlugin 29 December 2012 (e)" + "MIDIPlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:58 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:06 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -94,9 +94,9 @@ static sqInt maximumNumberOfFilesToWatch; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Mpeg3Plugin 29 December 2012 (i)" + "Mpeg3Plugin 3 January 2013 (i)" #else - "Mpeg3Plugin 29 December 2012 (e)" + "Mpeg3Plugin 3 January 2013 (e)" #endif ; static mpeg3_t *mpegFiles[1024+1]; @@ -921,6 +921,18 @@ sqInt aByteNumber; sqInt _return_value; + + /* int mpeg3_read_frame(mpeg3_t *file, + unsigned char **output_rows, + int in_x, + int in_y, + int in_w, + int in_h, + int out_w, + int out_h, + int color_model, + int stream) */ + fileHandle = interpreterProxy->stackValue(11); interpreterProxy->success(interpreterProxy->isWords(interpreterProxy->stackValue(10))); aBuffer = ((unsigned *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(10)))); @@ -991,6 +1003,18 @@ sqInt aByteNumber; sqInt _return_value; + + /* int mpeg3_read_frame(mpeg3_t *file, + unsigned char **output_rows, + int in_x, + int in_y, + int in_w, + int in_h, + int out_w, + int out_h, + int color_model, + int stream) */ + fileHandle = interpreterProxy->stackValue(10); interpreterProxy->success(interpreterProxy->isWords(interpreterProxy->stackValue(9))); aBuffer = ((unsigned *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(9)))); Modified: trunk/src/plugins/RomePlugin/RomePlugin.c =================================================================== --- trunk/src/plugins/RomePlugin/RomePlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/RomePlugin/RomePlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:59 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:07 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -192,9 +192,9 @@ static sqInt maxSurfaceID; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RomePlugin yo.39 29 December 2012 (i)" + "RomePlugin yo.39 3 January 2013 (i)" #else - "RomePlugin yo.39 29 December 2012 (e)" + "RomePlugin yo.39 3 January 2013 (e)" #endif ; static fn_ioRegisterSurface registerSurfaceFn; @@ -232,6 +232,9 @@ pangoAlignment = PANGO_ALIGN_CENTER; } if (alignment == 3) { + + /* self pangoLayoutSetJustify */ + null; } } @@ -490,6 +493,9 @@ if (interpreterProxy->failed()) { contextIndex = interpreterProxy->fetchPointerofObject(CanvasHandleIndex, canvasOop); if (!(contextIndex == (interpreterProxy->nilObject()))) { + + /* fail silently */ + fail("canvas handle not an integer"); } return null; @@ -1492,6 +1498,9 @@ if ((xFrom == xVia) && (yFrom == yVia)) { cairo_line_to(context, xTo, yTo); } else { + + /* increase degree to cubic: via1 = 1/3 from + 2/3 via, via2 = 2/3 via + 1/3 to */ + cairo_curve_to(context, (xFrom + (2.0 * xVia)) / 3.0, (yFrom + (2.0 * yVia)) / 3.0, ((2.0 * xVia) + xTo) / 3.0, ((2.0 * yVia) + yTo) / 3.0, xTo, yTo); } seg += 6; @@ -2823,6 +2832,22 @@ if (1) { pango_cairo_show_layout(context, layout); } else { + + /* self cairoTranslate: context x: 0 y: (self cCode: 'PANGO_PIXELS(baseline)'). + 0 to: lineCount - 1 do: [:lineIndex | + line := self pangoLayoutIterGetLineReadonly: lineIter. + + self pangoLayoutLineGetExtents: line ink: (self cCode: '&ink') logical: (self cCode: '&logical'). + self cairoTranslate: context x: (self cCode: '-(PANGO_PIXELS(ink.x))') y: 0. + self pangoCairoShowLayoutLine: context line: line. + self pangoLayoutIterNextLine: lineIter. + prevBaseline := baseline. + baseline := self pangoLayoutIterGetBaseline: lineIter. + self cairoTranslate: context x: (self cCode: 'PANGO_PIXELS(ink.x)') + y: (self cCode: 'PANGO_PIXELS(baseline-prevBaseline)'). + ]. + */ + null; } if (selStart == selEnd) { @@ -3471,18 +3496,33 @@ symbolOop = interpreterProxy->fetchPointerofObject(0, attrArray); symbol = interpreterProxy->firstIndexableField(symbolOop); if ((symbol[0]) == 65) { + + /* A */ + addAlignmentinto(attrArray, pangoAttrList); } if ((symbol[0]) == 67) { + + /* C */ + addColorinto(attrArray, pangoAttrList); } if ((symbol[0]) == 69) { + + /* E */ + addEmphasisinto(attrArray, pangoAttrList); } if ((symbol[0]) == 70) { + + /* F */ + addFontinto(attrArray, pangoAttrList); } if ((symbol[0]) == 76) { + + /* L */ + addLanguageinto(attrArray, pangoAttrList); } } Modified: trunk/src/plugins/ScratchPlugin/ScratchPlugin.c =================================================================== --- trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:53 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:07 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -82,9 +82,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ScratchPlugin 29 December 2012 (i)" + "ScratchPlugin 3 January 2013 (i)" #else - "ScratchPlugin 29 December 2012 (e)" + "ScratchPlugin 3 January 2013 (e)" #endif ; @@ -1534,6 +1534,9 @@ saturation = ((max - min) * 1000) / max; } if (saturation > 0) { + + /* do nothing if pixel is unsaturated (gray) */ + /* begin hueFromR:G:B:min:max: */ span = max - min; if (span == 0) { Modified: trunk/src/plugins/Squeak3D/Squeak3D.c =================================================================== --- trunk/src/plugins/Squeak3D/Squeak3D.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/Squeak3D/Squeak3D.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:51 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:05 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -873,11 +873,20 @@ triMask = (vtxArray[(idx1 * PrimVertexSize) + PrimVtxClipFlags]) & ((vtxArray[(idx2 * PrimVertexSize) + PrimVtxClipFlags]) & (vtxArray[(idx3 * PrimVertexSize) + PrimVtxClipFlags])); if (!((InAllMask & triMask) == InAllMask)) { + + /* Tri is not completely inside -> needs clipping. */ + if (triMask & OutAllMask) { + + /* tri is completely outside. Store all zeros */ + idxArray[i] = 0; idxArray[i + 1] = 0; idxArray[i + 2] = 0; } else { + + /* tri must be partially clipped. */ + interpreterProxy->pop(6); interpreterProxy->pushInteger(i); return null; @@ -950,6 +959,9 @@ lightCount = interpreterProxy->slotSizeOf(lightArray); for (i = 1; i <= vtxCount; i += 1) { + + /* Load the primitive vertex */ + /* begin loadPrimitiveVertex */ rgba = (((int*) litVertex))[PrimVtxColor32]; vtxInColor[2] = ((rgba & 255) * (1.0 / 255.0)); @@ -960,6 +972,9 @@ rgba = ((usqInt) rgba) >> 8; vtxInColor[3] = ((rgba & 255) * (1.0 / 255.0)); if (vbFlags & VBTrackEmission) { + + /* Load color from vertex */ + vtxOutColor[0] = ((vtxInColor[0]) + (primMaterial[EmissionRed])); vtxOutColor[1] = ((vtxInColor[1]) + (primMaterial[EmissionGreen])); vtxOutColor[2] = ((vtxInColor[2]) + (primMaterial[EmissionBlue])); @@ -971,6 +986,9 @@ vtxOutColor[3] = (primMaterial[EmissionAlpha]); } for (j = 0; j <= (lightCount - 1); j += 1) { + + /* Fetch the light source */ + /* begin fetchLightSource:ofObject: */ lightOop = interpreterProxy->fetchPointerofObject(j, lightArray); primLight = interpreterProxy->firstIndexableField(lightOop); @@ -1575,6 +1593,10 @@ } deltaCos = primLight[SpotLightDeltaCos]; if (deltaCos <= 1.0e-5) { + + /* No delta -- a sharp boundary between on and off. + Since off has already been determined above, we are on */ + return 1.0; } cosAngle = (cosAngle - minCos) / deltaCos; @@ -1819,6 +1841,9 @@ sqInt stateOop; if ((copyBitsFn == 0) || (loadBBFn == 0)) { + + /* We need loadBitBltFrom/copyBits here so try to load it implicitly */ + if (!(initialiseModule())) { return 0; } @@ -2148,6 +2173,9 @@ ptr = interpreterProxy->firstIndexableField(pluginName); needReload = 0; for (i = 0; i <= (length - 1); i += 1) { + + /* Compare and store the plugin to be used */ + if (!((bbPluginName[i]) == (ptr[i]))) { bbPluginName[i] = (ptr[i]); needReload = 1; @@ -2328,6 +2356,9 @@ lightScale = lightScale * (computeSpotFactor()); } if (lightScale > 0.001) { + + /* Compute the ambient part */ + if (lightFlags & FlagAmbientPart) { /* begin addPart:from:trackFlag:scale: */ if (vbFlags & VBTrackAmbient) { @@ -2349,6 +2380,8 @@ if (lightFlags & FlagDiffusePart) { /* Compute angle from light->vertex to vertex normal */ + + /* For one-sided lighting negate cosAngle if necessary */ cosAngle = dotProductOfFloatwithDouble(litVertex + PrimVtxNormal, l2vDirection); @@ -2376,6 +2409,9 @@ } } if ((lightFlags & FlagSpecularPart) && ((primMaterial[MaterialShininess]) > 0.0)) { + + /* Compute specular part */ + l2vSpecDir[0] = (l2vDirection[0]); l2vSpecDir[1] = (l2vDirection[1]); l2vSpecDir[2] = (l2vDirection[2]); @@ -2388,6 +2424,8 @@ if (cosAngle > 0.0) { /* Normalize the angle */ + + /* cosAngle should be somewhere between 0 and 1. If not, then the vertex normal was not normalized */ @@ -2776,7 +2814,13 @@ } } if ((mvFlags & FlagM44NoPerspective) && (prFlags == 0)) { + + /* Modelview matrix has no perspective part and projection is not optimized */ + if ((mvFlags == FlagM44NoTranslation) == 0) { + + /* Modelview matrix with translation */ + for (i = 1; i <= vtxCount; i += 1) { if (hasNormals) { transformPrimitiveNormalbyrescale(pVertex, modelViewMatrix, rescale); @@ -2786,6 +2830,9 @@ pVertex += PrimVertexSize; } } else { + + /* Modelview matrix without translation */ + for (i = 1; i <= vtxCount; i += 1) { if (hasNormals) { transformPrimitiveNormalbyrescale(pVertex, modelViewMatrix, rescale); @@ -2798,6 +2845,9 @@ return null; } if ((mvFlags & prFlags) & FlagM44Identity) { + + /* If both are identity matrices just copy entries */ + for (i = 1; i <= vtxCount; i += 1) { pVertex[PrimVtxRasterPosX] = (pVertex[PrimVtxPositionX]); pVertex[PrimVtxRasterPosY] = (pVertex[PrimVtxPositionY]); @@ -2808,6 +2858,9 @@ return null; } if (mvFlags & FlagM44Identity) { + + /* If model view matrix is identity just perform projection */ + for (i = 1; i <= vtxCount; i += 1) { transformPrimitiveRasterPositionby(pVertex, projectionMatrix); pVertex += PrimVertexSize; @@ -2815,6 +2868,10 @@ return null; } if (prFlags & FlagM44Identity) { + + /* If projection matrix is identity just transform and copy. + Note: This case is not very likely so it's not been unrolled. */ + for (i = 1; i <= vtxCount; i += 1) { if (hasNormals) { transformPrimitiveNormalbyrescale(pVertex, modelViewMatrix, rescale); Modified: trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c =================================================================== --- trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:53 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:05 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -125,9 +125,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SqueakFFIPrims 29 December 2012 (i)" + "SqueakFFIPrims 3 January 2013 (i)" #else - "SqueakFFIPrims 29 December 2012 (e)" + "SqueakFFIPrims 3 January 2013 (e)" #endif ; @@ -205,6 +205,10 @@ nilOop = interpreterProxy->nilObject(); if (!(argClass == nilOop)) { + + /* Type check 1: + Is the required class of the argument a subclass of ExternalStructure? */ + if (!(interpreterProxy->includesBehaviorThatOf(argClass, interpreterProxy->classExternalStructure()))) { /* begin ffiFail: */ ffiLastError = FFIErrorWrongType; @@ -218,10 +222,10 @@ } isStruct = 0; if (!(((oop & 1)) || (oop == nilOop))) { - if (interpreterProxy->isPointers(oop)) { - /* #isPointers: will fail if oop is SmallInteger so don't even attempt to use it */ + /* #isPointers: will fail if oop is SmallInteger so don't even attempt to use it */ + if (interpreterProxy->isPointers(oop)) { isStruct = interpreterProxy->includesBehaviorThatOf(oopClass, interpreterProxy->classExternalStructure()); if (!((argClass == nilOop) || (isStruct))) { /* begin ffiFail: */ @@ -265,6 +269,9 @@ ffiArgHeader = longAt(ffiArgSpec); if (ffiArgHeader & FFIFlagStructure) { + + /* argument must be ExternalStructure */ + if (!(isStruct)) { /* begin ffiFail: */ ffiLastError = FFIErrorCoercionFailed; @@ -315,6 +322,9 @@ return interpreterProxy->primitiveFail(); } if (ffiArgHeader & FFIFlagPointer) { + + /* no integers for pointers please */ + if ((oop & 1)) { /* begin ffiFail: */ ffiLastError = FFIErrorIntAsPointer; @@ -324,6 +334,9 @@ return ffiPushPointer(null); } if (ffiArgHeader & FFIFlagAtomic) { + + /* e.g., ExternalData */ + if (isStruct) { /* begin ffiAtomicStructByReference:Class: */ if (!(oopClass == (interpreterProxy->classExternalData()))) { @@ -448,6 +461,9 @@ return ffiPushPointerContentsOf(valueOop); } if (ffiArgHeader & FFIFlagAtomic) { + + /* argument is atomic value */ + /* begin ffiArgByValue: */ atomicType2 = ((usqInt) (ffiArgHeader & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; if ((atomicType2 < 0) || (atomicType2 > FFITypeDoubleFloat)) { @@ -583,10 +599,10 @@ sqInt shift; sqInt value; - if (ffiRetHeader & FFIFlagPointer) { - /* Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct */ + /* Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct */ + if (ffiRetHeader & FFIFlagPointer) { retVal = ffiCallAddressOfWithPointerReturn(address, callType); return ffiCreateReturnPointer(retVal); } @@ -692,6 +708,9 @@ lowWord = ffiLongLongResultLow(); highWord = ffiLongLongResultHigh(); if (isSigned) { + + /* check for 32 bit signed */ + if ((highWord == 0) && (lowWord >= 0)) { return interpreterProxy->signed32BitIntegerFor(lowWord); } @@ -713,6 +732,9 @@ largeClass = interpreterProxy->classLargePositiveInteger(); } } else { + + /* check for 32 bit unsigned */ + if (highWord == 0) { return interpreterProxy->positive32BitIntegerFor(lowWord); } @@ -768,6 +790,9 @@ atomicType = ((usqInt) (ffiRetHeader & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; if ((((usqInt) atomicType) >> 1) == (((usqInt) FFITypeSignedChar) >> 1)) { + + /* String return */ + return ffiReturnCStringFrom(retVal); } interpreterProxy->pushRemappableOop(ffiRetOop); @@ -857,6 +882,8 @@ /* Lookup the address */ + + /* Make sure it's an external handle */ addressPtr = interpreterProxy->fetchPointerofObject(0, lit); @@ -885,6 +912,9 @@ return 0; } if (address == 0) { + + /* Go look it up in the module */ + if ((interpreterProxy->slotSizeOf(lit)) < 5) { /* begin ffiFail: */ ffiLastError = FFIErrorNoModule; @@ -1771,10 +1801,10 @@ return 0; } if (byteSize < 4) { - if (byteSize == 1) { - /* short/byte */ + /* short/byte */ + if (byteSize == 1) { value = byteAt(addr); } else { value = *((unsigned short int *) addr); Modified: trunk/src/plugins/UUIDPlugin/UUIDPlugin.c =================================================================== --- trunk/src/plugins/UUIDPlugin/UUIDPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/UUIDPlugin/UUIDPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:53:01 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:07 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -53,9 +53,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UUIDPlugin 29 December 2012 (i)" + "UUIDPlugin 3 January 2013 (i)" #else - "UUIDPlugin 29 December 2012 (e)" + "UUIDPlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/UnicodePlugin/UnicodePlugin.c =================================================================== --- trunk/src/plugins/UnicodePlugin/UnicodePlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/UnicodePlugin/UnicodePlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:53:01 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:07 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnicodePlugin 29 December 2012 (i)" + "UnicodePlugin 3 January 2013 (i)" #else - "UnicodePlugin 29 December 2012 (e)" + "UnicodePlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:53:02 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:07 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -218,9 +218,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin 29 December 2012 (i)" + "UnixOSProcessPlugin 3 January 2013 (i)" #else - "UnixOSProcessPlugin 29 December 2012 (e)" + "UnixOSProcessPlugin 3 January 2013 (e)" #endif ; static void *originalSigHandlers[NSIG]; @@ -278,6 +278,9 @@ int filedes[2]; if ((pipe(filedes)) == -1) { + + /* Translates to a pipe() system call */ + return 0; } else { *writerIOStreamPtr= (FILE *) fdopen (filedes[1], "a"); @@ -442,6 +445,10 @@ pid_t pid; struct itimerval saveIntervalTimer; + + /* Turn off the interval timer. If this is not done, then the program which we exec in + the child process will receive a timer interrupt, and will not know how to handle it. */ + intervalTimer.it_interval.tv_sec = 0; intervalTimer.it_interval.tv_usec = 0; intervalTimer.it_value.tv_sec = 0; @@ -473,19 +480,26 @@ return null; } if (semaphoreIndex == 0) { - if ((semaIndices[sigNum]) != 0) { - /* Disable the handler */ + /* Disable the handler */ + if ((semaIndices[sigNum]) != 0) { oldHandler = originalSigHandlers[sigNum]; oldHandler = setSignalNumberhandler(sigNum, oldHandler); semaIndices[sigNum] = 0; return oldHandler; } else { + + /* either -1 for printAllStacks or a positive integer for semaphore forwarding */ + /* Signal handler had not been set, answer an error */ + return sigErrorNumber(); } } if ((semaIndices[sigNum]) > 0) { + + /* Handler is already set, answer an error */ + return sigErrorNumber(); } oldHandler = setSignalNumberhandler(sigNum, handleSignalFunctionAddress()); @@ -647,6 +661,10 @@ # ifdef SA_ONSTACK // true if platform supports sigaltstack, else meaningless redeclarations of stack_t and sigaction setSigaltstack(); # else + + /* override stack_t declared in sigstack.h because declarations + cannot easily be removed from setSigaltstack */ + # define stack_t sqInt @@ -1192,10 +1210,17 @@ sqInt workingDir; sqInt sigNum; + + /* Do not fork child if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(10); interpreterProxy->pushInteger(-1); } else { + + /* Turn off the interval timer. If this is not done, then the program which we exec in + the child process will receive a timer interrupt, and will not know how to handle it. */ + intervalTimer.it_interval.tv_sec = 0; intervalTimer.it_interval.tv_usec = 0; intervalTimer.it_value.tv_sec = 0; @@ -1289,6 +1314,10 @@ /* Can't get here from there */; } } else { + + /* Normal return to Smalltalk - this is the old parent process. */ + /* Enable the timer again before resuming Smalltalk. */ + setitimer (ITIMER_REAL, &saveIntervalTimer, 0L); interpreterProxy->pop(10); interpreterProxy->pushInteger(pid); @@ -1327,6 +1356,9 @@ EXPORT(sqInt) primitiveForkSqueakWithoutSigHandler(void) { pid_t pid; + + /* Do not fork child if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(1); interpreterProxy->pushInteger(-1); @@ -1717,6 +1749,9 @@ errno = 0; result = nice(niceIncrement); if (result == -1) { + + /* sys call may have failed, test errno to be sure */ + if (!(errno == 0)) { return interpreterProxy->primitiveFail(); } @@ -1768,6 +1803,9 @@ keyValueString = interpreterProxy->stackObjectValue(0); cStringPtr = cStringFromString(keyValueString); if ((putenv(cStringPtr)) == 0) { + + /* Set environment variable. */ + interpreterProxy->pop(2); interpreterProxy->push(keyValueString); } else { @@ -1972,6 +2010,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2000,6 +2041,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2029,6 +2073,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2057,6 +2104,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2085,6 +2135,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2113,6 +2166,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2141,6 +2197,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2169,6 +2228,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2197,6 +2259,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2225,6 +2290,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2253,6 +2321,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2281,6 +2352,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2309,6 +2383,9 @@ int result; sqInt sig; + + /* Do not allow signal sending if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); @@ -2666,6 +2743,9 @@ return null; } if ((semaIndices[sigNum]) > 0) { + + /* Handler is already set, answer an error */ + return sigErrorNumber(); } newHandler = getPrintAllStacksFunction(); @@ -2812,6 +2892,9 @@ # ifdef SA_ONSTACK // true if platform supports sigaltstack + + /* See if there's already a sigaltstack in place */ + if ((sigaltstack(0,&sigstack)) < 0) { perror("sigaltstack"); } Modified: trunk/src/plugins/WeDoPlugin/WeDoPlugin.c =================================================================== --- trunk/src/plugins/WeDoPlugin/WeDoPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/WeDoPlugin/WeDoPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:53:02 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:08 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -54,9 +54,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "WeDoPlugin 29 December 2012 (i)" + "WeDoPlugin 3 January 2013 (i)" #else - "WeDoPlugin 29 December 2012 (e)" + "WeDoPlugin 3 January 2013 (e)" #endif ; Modified: trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c =================================================================== --- trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:53:02 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:27:08 pm + by VMMaker 4.10.8 */ #include <math.h> @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "XDisplayControlPlugin 29 December 2012 (i)" + "XDisplayControlPlugin 3 January 2013 (i)" #else - "XDisplayControlPlugin 29 December 2012 (e)" + "XDisplayControlPlugin 3 January 2013 (e)" #endif ; static int osprocessSandboxSecurity; @@ -114,6 +114,9 @@ sqInt name; char * namePtr; + + /* Do not allow this if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->push(interpreterProxy->falseObject()); @@ -122,9 +125,15 @@ namePtr = transientCStringFromString(name); d = XOpenDisplay(namePtr); if (d == 0) { + + /* Failed to make connection to server, answer false */ + interpreterProxy->pop(2); interpreterProxy->push(interpreterProxy->falseObject()); } else { + + /* Successfully opened connection; close it and answer true */ + XCloseDisplay(d); interpreterProxy->pop(2); interpreterProxy->push(interpreterProxy->trueObject()); @@ -221,6 +230,9 @@ static char nameBuffer[501]; char * namePtr; + + /* Do not allow this if running in secure mode */ + if ((sandboxSecurity()) == 1) { interpreterProxy->pop(2); interpreterProxy->pushInteger(-1); Modified: trunk/src/vm/interp.c =================================================================== --- trunk/src/vm/interp.c 2013-01-03 22:00:52 UTC (rev 2655) +++ trunk/src/vm/interp.c 2013-01-04 04:55:58 UTC (rev 2656) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 29 December 2012 7:52:34 pm - by VMMaker 4.10.7 +/* Automatically generated from Squeak on 3 January 2013 11:26:59 pm + by VMMaker 4.10.8 */ #if 1 # define SQ_USE_GLOBAL_STRUCT 1 @@ -158,7 +158,7 @@ #define InitialIPIndex 4 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 -#define InterpreterSourceVersion "4.10.7" +#define InterpreterSourceVersion "4.10.8" #define InvokeCallbackSelector 53 #define LargeContextBit 262144 #define LastLinkIndex 1 @@ -929,7 +929,7 @@ struct foo * foo = &fum; sqInt extraVMMemory; -const char *interpreterVersion = "Squeak4.3 of 22 December 2011 [latest update: #11860]"; +const char *interpreterVersion = "Squeak4.3 of 2 January 2013 [latest update: #12359]"; sqInt (*compilerHooks[16])(); struct VirtualMachine* interpreterProxy; sqInt imageFormatVersionNumber = 0; @@ -1722,6 +1722,9 @@ for (p = 0; p <= (CacheProbeMax - 1); p += 1) { probe = (((usqInt) hash) >> p) & MethodCacheMask; if ((foo->methodCache[probe + MethodCacheSelector]) == 0) { + + /* Found an empty entry -- use it */ + foo->methodCache[probe + MethodCacheSelector] = foo->messageSelector; foo->methodCache[probe + MethodCacheClass] = foo->lkupClass; foo->methodCache[probe + MethodCacheMethod] = foo->newMethod; @@ -1937,6 +1940,9 @@ sqInt oop3; if (foo->allocationCount >= foo->allocationsBetweenGCs) { + + /* do an incremental GC every so many allocations to keep pauses short */ + incrementalGC(); } /* begin sufficientSpaceToAllocate: */ @@ -2103,6 +2109,9 @@ return 1; } if (!foo->primFailCode) { + + /* Successful prim, stack must have exactly nArgs arguments popped off */ + return ((foo->stackPointer - foo->activeContext) + (nArgs * (BYTES_PER_WORD))) == delta; } return (foo->stackPointer - foo->activeContext) == delta; @@ -2117,6 +2126,9 @@ sqInt header; if (((((usqInt) oop)) < (((usqInt) foo->youngStart))) && (!((oop & 1)))) { + + /* Yes, oop is an old object */ + /* begin noteAsRoot:headerLoc: */ header = longAt(oop); if ((header & (ROOT_BIT)) == 0) { @@ -2176,6 +2188,9 @@ } } } else { + + /* Normal -- no forwarding */ + /* begin noteAsRoot:headerLoc: */ header2 = longAt(oop); if ((header2 & (ROOT_BIT)) == 0) { @@ -2241,8 +2256,14 @@ return 0; } if (allYoungand(array1, array2)) { + + /* sweep only the young objects plus the roots */ + mapPointersInObjectsFromto(foo->youngStart, foo->endOfMemory); } else { + + /* sweep all objects */ + mapPointersInObjectsFromto(memory, foo->endOfMemory); } if (twoWayFlag) { @@ -2536,6 +2557,9 @@ sqInt lastLink; sqInt oop21; + + /* For now, do not allow a callback unless we're in a primitiveResponse */ + if (foo->primitiveIndex == 0) { return 0; } @@ -2561,6 +2585,9 @@ foo->nextPollTick = 0; result = setjmp(foo->jmpBuf[foo->jmpDepth]); if (result == 0) { + + /* Fill in callbackID */ + callbackID[0] = foo->jmpDepth; interpret(); } @@ -2693,6 +2720,9 @@ } longAtput(rcvr, ((longAt(rcvr)) & (~CompactClassMask)) | ccIndex); } else { + + /* Exchange the class pointer, which could make rcvr a root for argClass */ + longAtput(rcvr - (BASE_HEADER_SIZE), argClass | ((longAt(rcvr)) & TypeMask)); if ((((usqInt) rcvr)) < (((usqInt) foo->youngStart))) { possibleRootStoreIntovalue(rcvr, argClass); @@ -2753,9 +2783,11 @@ now = (ioMSecs()) & MillisecondClockMask; if (!(foo->interruptCheckCounter < -100)) { + + /* don't play with the feedback if we forced a check. It only makes life difficult */ + if ((now - foo->lastTick) < foo->interruptChecksEveryNms) { - /* don't play with the feedback if we forced a check. It only makes life difficult */ /* wrapping is not a concern, it'll get caught quickly enough. This clause is trying to keep a reasonable guess of how many times per interruptChecksEveryNms we are calling @@ -2882,6 +2914,9 @@ sqInt checkImageVersionFromstartingAt(sqImageFile f, squeakFileOffsetType imageOffset) { sqInt firstVersion; + + /* check the version number */ + sqImageFileSeek(f, imageOffset); imageFormatInitialVersion = (firstVersion = getLongFromFileswap(f, 0)); if (readableFormat(imageFormatInitialVersion)) { @@ -2893,6 +2928,9 @@ return 1; } if (imageOffset == 0) { + + /* try skipping the first 512 bytes (prepended by certain Mac file transfer utilities) */ + sqImageFileSeek(f, 512); imageFormatInitialVersion = getLongFromFileswap(f, 0); if (readableFormat(imageFormatInitialVersion)) { @@ -3284,10 +3322,15 @@ if ((foo->messageSelector == (fetchPointerofObject(16 * 2, fetchPointerofObject(SpecialSelectors, foo->specialObjectsOop)))) && (foo->lkupClass == (fetchClassOfNonInt(rcvr)))) { /* OK -- look in the at-cache */ + + /* Index into atCache = 4N, for N = 0 ... 7 */ atIx = rcvr & AtCacheMask; if (!((foo->atCache[atIx + AtCacheOop]) == rcvr)) { + + /* Rcvr not in cache. Install it... */ + installinAtCacheatstring(rcvr, foo->atCache, atIx, stringy); } if (!foo->primFailCode) { @@ -3352,10 +3395,15 @@ if ((foo->messageSelector == (fetchPointerofObject(17 * 2, fetchPointerofObject(SpecialSelectors, foo->specialObjectsOop)))) && (foo->lkupClass == (fetchClassOfNonInt(rcvr)))) { /* OK -- look in the at-cache */ + + /* Index into atPutCache */ atIx = (rcvr & AtCacheMask) + AtPutBase; if (!((foo->atCache[atIx + AtCacheOop]) == rcvr)) { + + /* Rcvr not in cache. Install it... */ + installinAtCacheatstring(rcvr, foo->atCache, atIx, stringy); } if (!foo->primFailCode) { @@ -3456,12 +3504,19 @@ return result; } if (fmt >= 16) { + + /* Note fmt >= 16 is an artificial flag for strings */ + /* String */ + /* begin fetchPointer:ofObject: */ /* begin fetchPointer:ofObject: */ oop1 = foo->specialObjectsOop; oop = longAt((oop1 + (BASE_HEADER_SIZE)) + (CharacterTable << (SHIFT_FOR_WORD))); return longAt((oop + (BASE_HEADER_SIZE)) + ((byteAt((rcvr + (BASE_HEADER_SIZE)) + (index - 1))) << (SHIFT_FOR_WORD))); } else { + + /* ByteArray */ + return (((byteAt((rcvr + (BASE_HEADER_SIZE)) + (index - 1))) << 1) | 1); } } @@ -3793,6 +3848,9 @@ } longAtput((message + (BASE_HEADER_SIZE)) + (MessageArgumentsIndex << (SHIFT_FOR_WORD)), argumentArray); if ((lastPointerOf(message)) >= ((MessageLookupClassIndex * (BYTES_PER_WORD)) + (BASE_HEADER_SIZE))) { + + /* Only store lookupClass if message has 3 fields (old images don't) */ + /* begin storePointer:ofObject:withValue: */ if ((((usqInt) message)) < (((usqInt) foo->youngStart))) { possibleRootStoreIntovalue(message, lookupClass); @@ -4148,6 +4206,9 @@ if (ccIndex == 0) { return (longAt(oop - (BASE_HEADER_SIZE))) & (ALL_BUT_TYPE_MASK); } else { + + /* look up compact class */ + /* begin fetchPointer:ofObject: */ /* begin fetchPointer:ofObject: */ oop3 = foo->specialObjectsOop; @@ -4165,6 +4226,9 @@ if (ccIndex == 0) { return (longAt(oop - (BASE_HEADER_SIZE))) & (ALL_BUT_TYPE_MASK); } else { + + /* look up compact class */ + /* begin fetchPointer:ofObject: */ /* begin fetchPointer:ofObject: */ oop2 = foo->specialObjectsOop; @@ -4339,19 +4403,22 @@ weakOop = longAt(oop + i); if (!((weakOop == foo->nilObj) || (((weakOop & 1)) || (weakOop < foo->youngStart)))) { - if (weakOop < oop) { - /* Check if the object is being collected. + /* Check if the object is being collected. If the weak reference points * backward: check if the weakOops chunk is free * forward: check if the weakOoop has been marked by GC */ + if (weakOop < oop) { chunk = weakOop - (foo->headerTypeBytes[(longAt(weakOop)) & TypeMask]); oopGone = ((longAt(chunk)) & TypeMask) == HeaderTypeFree; } else { oopGone = ((longAt(weakOop)) & (MARK_BIT)) == 0; } if (oopGone) { + + /* Store nil in the pointer and signal the interpreter */ + longAtput(oop + i, foo->nilObj); if (nonWeakCnt >= 2) { /* begin weakFinalizerCheck: */ @@ -4507,6 +4574,9 @@ ok = 0; l1: /* end lookupInMethodCacheSel:class: */; if (!(ok)) { + + /* entry was not found in the cache; look it up the hard way */ + lookupMethodInClass(class); foo->lkupClass = class; addNewMethodToCache(); @@ -4692,10 +4762,16 @@ l3: /* end fixedFieldsOf:format:length: */; if (fmt < 8) { if (fmt == 6) { + + /* 32 bit field objects */ + return pointerForOop((oop + (BASE_HEADER_SIZE)) + (fixedFields << 2)); } return pointerForOop((oop + (BASE_HEADER_SIZE)) + (fixedFields << (SHIFT_FOR_WORD))); } else { + + /* Byte objects */ + return pointerForOop((oop + (BASE_HEADER_SIZE)) + fixedFields); } } @@ -4800,10 +4876,16 @@ while ((((usqInt) oop)) < (((usqInt) foo->endOfMemory))) { if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { if (((((usqInt) (longAt(oop))) >> 8) & 15) >= 12) { + + /* This is a compiled method */ + /* begin primitiveIndexOf: */ primBits = (((usqInt) (longAt((oop + (BASE_HEADER_SIZE)) + (HeaderIndex << (SHIFT_FOR_WORD))))) >> 1) & 268435967; primIdx = (primBits & 511) + (((usqInt) primBits) >> 19); if (primIdx == PrimitiveExternalCallIndex) { + + /* It's primitiveExternalCall */ + flushExternalPrimitiveOf(oop); } } @@ -4952,6 +5034,9 @@ sqInt fwdTableInit(sqInt blkSize) { register struct foo * foo = &fum; + + /* set endOfMemory to just after a minimum-sized free block */ + /* begin setSizeOfFree:to: */ longAtput(foo->freeBlock, ((BASE_HEADER_SIZE) & (ALL_BUT_TYPE_MASK)) | HeaderTypeFree); @@ -5107,6 +5192,9 @@ register struct foo * foo = &fum; sqInt bytesFreed; + + /* reserve memory for forwarding table */ + fwdTableInit((BYTES_PER_WORD) * 2); /* update pointers to point at new oops */ @@ -5145,6 +5233,9 @@ if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { bytesFreed += (longAt(oop)) & (ALL_BUT_TYPE_MASK); } else { + + /* create a forwarding block for oop */ + /* begin fwdBlockGet: */ foo->fwdTableNext += (BYTES_PER_WORD) * 2; if (foo->fwdTableNext <= foo->fwdTableLast) { @@ -5368,6 +5459,9 @@ if ((objectAfter(newFreeChunk)) == foo->endOfMemory) { initializeMemoryFirstFree(newFreeChunk); } else { + + /* newFreeChunk is not at end of memory; re-install freeBlock */ + initializeMemoryFirstFree(foo->freeBlock); } return newFreeChunk; @@ -5784,6 +5878,9 @@ hdr = longAt(rcvr); fmt = (((usqInt) hdr) >> 8) & 15; if ((fmt == 3) && ((((((usqInt) hdr) >> 12) & 31) == 13) || ((((((usqInt) hdr) >> 12) & 31) == 14) || (((((usqInt) hdr) >> 12) & 31) == 4)))) { + + /* Contexts must not be put in the atCache, since their size is not constant */ + /* begin primitiveFail */ if (foo->primFailCode == 0) { foo->primFailCode = 1; @@ -6391,8 +6488,14 @@ sqInt integerValueOf(sqInt objectPointer) { if ((objectPointer & 2147483648U) != 0) { + + /* negative */ + return ((((usqInt) (objectPointer & 2147483647U)) >> 1) - 1073741823) - 1; } else { + + /* positive */ + return ((usqInt) objectPointer) >> 1; } } @@ -12935,6 +13038,9 @@ sqInt int64; sqInt shiftCount; + + /* 32 bit signed integer */ + # ifdef SQ_IMAGE64 // a 64-bit object memory word size @@ -12956,6 +13062,9 @@ } return 0; # else + + /* if sqInt is 64 bit, size parameter may overflow int32 */ + if (size > 4294967295U) { return 0; } @@ -13162,6 +13271,9 @@ fmt = (((usqInt) header) >> 8) & 15; if (fmt <= 4) { if ((fmt == 3) && ((((((usqInt) header) >> 12) & 31) == 13) || ((((((usqInt) header) >> 12) & 31) == 14) || (((((usqInt) header) >> 12) & 31) == 4)))) { + + /* contexts end at the stack pointer */ + /* begin fetchStackPointerOf: */ sp = longAt((oop + (BASE_HEADER_SIZE)) + (StackPointerIndex << (SHIFT_FOR_WORD))); if (!((sp & 1))) { @@ -13381,6 +13493,10 @@ while (currentClass != foo->nilObj) { dictionary = longAt((currentClass + (BASE_HEADER_SIZE)) + (MessageDictionaryIndex << (SHIFT_FOR_WORD))); if (dictionary == foo->nilObj) { + + /* MethodDict pointer is nil (hopefully due a swapped out stub) + -- raise exception #cannotInterpret:. */ + /* begin pushRemappableOop: */ foo->remapBuffer[(foo->remapBufferCount += 1)] = currentClass; createActualMessageTo(class); @@ -13897,12 +14013,17 @@ if (((((usqInt) (longAt(oop))) >> 8) & 15) == 4) { /* Set lastFieldOffset before the weak fields in the receiver */ + + /* And remember as weak root */ lastFieldOffset = (nonWeakFieldsOf(oop)) << (SHIFT_FOR_WORD); foo->weakRootCount += 1; foo->weakRoots[foo->weakRootCount] = oop; } else { + + /* Do it the usual way */ + /* begin lastPointerOf: */ header1 = longAt(oop); fmt = (((usqInt) header1) >> 8) & 15; @@ -14264,6 +14385,9 @@ sqInt oop2; sqInt oop3; + + /* No need to inline - we won't call this often */ + if (!(((((usqInt) (longAt(oop))) >> 8) & 15) == 4)) { error("Called fixedFieldsOfWeak: with a non-weak oop"); } @@ -14310,6 +14434,9 @@ sqInt header2; if (!(isBigEnder())) { + + /* Swap words within Float objects, taking them out of native platform ordering */ + /* begin firstAccessibleObject */ obj1 = memory + (foo->headerTypeBytes[(longAt(memory)) & TypeMask]); while ((((usqInt) obj1)) < (((usqInt) foo->endOfMemory))) { @@ -14417,9 +14544,11 @@ header = longAt(headerLoc); if ((header & (ROOT_BIT)) == 0) { + + /* record oop as root only if not already recorded */ + if (foo->rootTableCount < RootTableRedZone) { - /* record oop as root only if not already recorded */ /* record root if there is enough room in the roots table */ @@ -14427,9 +14556,11 @@ foo->rootTable[foo->rootTableCount] = oop; longAtput(headerLoc, header | (ROOT_BIT)); } else { + + /* we're getting in the red zone */ + if (foo->rootTableCount < RootTableSize) { - /* we're getting in the red zone */ /* but there's still space to record it */ foo->rootTableCount += 1; @@ -15108,6 +15239,9 @@ sqInt header; if (((((usqInt) valueObj)) >= (((usqInt) foo->youngStart))) && (!((valueObj & 1)))) { + + /* Yes, valueObj is a young object */ + /* begin noteAsRoot:headerLoc: */ header = longAt(oop); if ((header & (ROOT_BIT)) == 0) { @@ -15148,6 +15282,10 @@ } } if (oopisGreaterThan((longAt(foo->freeBlock)) & (ALL_BUT_TYPE_MASK), foo->shrinkThreshold)) { + + /* Attempt to shrink memory after successfully + reclaiming lots of memory */ + /* begin shrinkObjectMemory: */ delta = ((longAt(foo->freeBlock)) & (ALL_BUT_TYPE_MASK)) - foo->growHeadroom; foo->statShrinkMemory += 1; @@ -15328,6 +15466,9 @@ } longAtput(oop1, (((usqInt) fwdBlock) >> 1) | ((MARK_BIT) | originalHeaderType1)); if (twoWayFlag) { + + /* Second block maps oop2 back to oop1 for two-way become */ + /* begin fwdBlockGet: */ foo->fwdTableNext += fwdBlkSize; if (foo->fwdTableNext <= foo->fwdTableLast) { @@ -15415,6 +15556,9 @@ return null; } if (aIsNegative == bIsNegative) { + + /* Protect against overflow */ + if (a > (18446744073709551615U - b)) { /* begin primitiveFail */ if (foo->primFailCode == 0) { @@ -15485,6 +15629,9 @@ l2: /* end stackObjectValue: */; err = changeClassOfto(arg, rcvr); if (err == 0) { + @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-dtl.294.mcz
by commits＠source.squeak.org 04 Jan '13

04 Jan '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.294.mcz ==================== Summary ==================== Name: VMMaker-dtl.294 Author: dtl Time: 3 January 2013, 11:50:21.809 pm UUID: f4540612-7d99-4520-8a31-f689304b18cc Ancestors: VMMaker-dtl.293 VMMaker 4.10.8 Add missing comment generation for TStmtListNode. This provides additional embedded comments in generated C source. Background: A recent change to the compiler in Squeak trunk causes comments to be associated with statement lists rather than assignment nodes if the comment appears at the beginning of a block. This is a worthwhile change, but it exposes a bug in C code generation in which these comments are lost from from generated C code. This update restores the expected generation of comments at the beginning of blocks when VMMaker is run in updated Squeak images. It also results in additional embedded comments in various places throughout the generated C sources. There is no functional impact on generated code, and the bug is not present in the oscog branch of VMMaker. =============== Diff against VMMaker-dtl.293 =============== Item was changed: ----- Method: TStmtListNode>>emitCCodeOn:level:generator: (in category 'as yet unclassified') ----- emitCCodeOn: aStream level: level generator: aCodeGen + self emitCCommentOn: aStream level: level. statements do: [:s | s emitCCommentOn: aStream level: level. aStream tab: level. s emitCCodeOn: aStream level: level generator: aCodeGen. (((self endsWithCloseBracket: aStream) not and: [(s isComment) not]) and: [s requiresCLineTerminator]) ifTrue: [aStream nextPut: $;]. aStream cr]. ! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.10.8'! - ^'4.10.7'!

1 0

[commit][2655] CogVM source as per VMMaker.oscog-eem.248.
by commits＠squeakvm.org 03 Jan '13

03 Jan '13

Revision: 2655 Author: eliot Date: 2013-01-03 14:00:52 -0800 (Thu, 03 Jan 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.248. Integrate directed shift changes from cog issue 111 that affect the CoInterpreter and Cogit. Make the translated primitive plugins include info from their primitive supplying classes. Add a script that reverts and touches file to correct date (why svn/hg/git revert omit this I can't fathom; points to support for manual edit only?). Modified Paths: -------------- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/exampleSqNamedPrims.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Added Paths: ----------- branches/Cog/scripts/svnrevert Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,9 +1,17 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795 + ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 + ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 + SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\ +Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795\n\ +ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ +ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ +SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c " __DATE__ ; @@ -87,9 +95,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.235 (i)" + "MiscPrimitivePlugin VMMaker.oscog-eem.248 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.235 (e)" + "MiscPrimitivePlugin VMMaker.oscog-eem.248 (e)" #endif ; Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 + CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 + StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -16280,7 +16280,7 @@ static sqInt registerMaskFor(sqInt reg) { - return (((1 - reg) < 0) ? ((usqInt) 1 >> -(1 - reg)) : ((usqInt) 1 << (1 - reg))); + return 1 << (1 - reg); } @@ -16290,7 +16290,7 @@ static sqInt registerMaskForand(sqInt reg1, sqInt reg2) { - return ((((1 - reg1) < 0) ? ((usqInt) 1 >> -(1 - reg1)) : ((usqInt) 1 << (1 - reg1)))) | ((((1 - reg2) < 0) ? ((usqInt) 1 >> -(1 - reg2)) : ((usqInt) 1 << (1 - reg2)))); + return (1 << (1 - reg1)) | (1 << (1 - reg2)); } @@ -16300,7 +16300,7 @@ static sqInt registerMaskForandand(sqInt reg1, sqInt reg2, sqInt reg3) { - return (((((1 - reg1) < 0) ? ((usqInt) 1 >> -(1 - reg1)) : ((usqInt) 1 << (1 - reg1)))) | ((((1 - reg2) < 0) ? ((usqInt) 1 >> -(1 - reg2)) : ((usqInt) 1 << (1 - reg2))))) | ((((1 - reg3) < 0) ? ((usqInt) 1 >> -(1 - reg3)) : ((usqInt) 1 << (1 - reg3)))); + return ((1 << (1 - reg1)) | (1 << (1 - reg2))) | (1 << (1 - reg3)); } static sqInt Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 + CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 + CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1928,7 +1928,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.246"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.248"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6127,7 +6127,7 @@ /* don't ask if one should compile a second time... */ - GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2))); + GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2); } } } @@ -12371,7 +12371,7 @@ /* don't ask if one should compile a second time... */ - GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2))); + GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2); } } } @@ -49160,7 +49160,7 @@ static sqInt stackPageByteSize(void) { - return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)))); + return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)); } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ Modified: branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h =================================================================== --- branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* This is an automatically generated table of all builtin modules in the VM - CoInterpreterPrimitives VMMaker.oscog-eem.243 + CoInterpreterPrimitives VMMaker.oscog-eem.248 */ extern sqExport vm_exports[]; Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1931,7 +1931,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.246"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.248"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6136,7 +6136,7 @@ /* don't ask if one should compile a second time... */ - GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2))); + GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2); } } } @@ -12380,7 +12380,7 @@ /* don't ask if one should compile a second time... */ - GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2))); + GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2); } } } @@ -49169,7 +49169,7 @@ static sqInt stackPageByteSize(void) { - return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)))); + return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)); } Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/vm/interp.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jan 2 18:30:24 PST 2013 + Thu Jan 3 13:56:35 PST 2013 Added: branches/Cog/scripts/svnrevert =================================================================== --- branches/Cog/scripts/svnrevert (rev 0) +++ branches/Cog/scripts/svnrevert 2013-01-03 22:00:52 UTC (rev 2655) @@ -0,0 +1,9 @@ +#!/bin/sh +# Revert file(s) and touch them back to the checkin date +for f in "$@" +do + if svn revert "$f"; then + changed="`svn info \"$f\" | grep 'Last Changed Date:' | sed 's/ *(.*//'`" + touch -t "`date -j -f 'Last Changed Date: %Y-%m-%d %H:%M:%S %z' \"$changed\" '+%Y%m%d%H%M.%S'`" "$f" + fi +done Property changes on: branches/Cog/scripts/svnrevert ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,9 +1,11 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - ADPCMCodecPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + ADPCMCodecPlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + ADPCMCodec * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\ +ADPCMCodec * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c " __DATE__ ; @@ -87,9 +89,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin VMMaker.oscog-eem.235 (i)" + "ADPCMCodecPlugin VMMaker.oscog-eem.248 (i)" #else - "ADPCMCodecPlugin VMMaker.oscog-eem.235 (e)" + "ADPCMCodecPlugin VMMaker.oscog-eem.248 (e)" #endif ; @@ -208,13 +210,13 @@ /* begin nextBits: */ result = 0; remaining = 16; - while (1) { + while(1) { shift = remaining - bitPosition; - result += ((shift < 0) ? ((usqInt) currentByte >> -shift) : ((usqInt) currentByte << shift)); if (shift > 0) { /* consumed currentByte buffer; fetch next byte */ + result += currentByte << shift; remaining -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; @@ -223,11 +225,12 @@ /* still some bits left in currentByte buffer */ + result += ((usqInt) currentByte) >> (0 - shift); /* mask out the consumed bits: */ bitPosition -= remaining; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); predicted = result; goto l1; } @@ -239,13 +242,13 @@ /* begin nextBits: */ result1 = 0; remaining1 = 6; - while (1) { + while(1) { shift1 = remaining1 - bitPosition; - result1 += ((shift1 < 0) ? ((usqInt) currentByte >> -shift1) : ((usqInt) currentByte << shift1)); if (shift1 > 0) { /* consumed currentByte buffer; fetch next byte */ + result1 += currentByte << shift1; remaining1 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; @@ -254,11 +257,12 @@ /* still some bits left in currentByte buffer */ + result1 += ((usqInt) currentByte) >> (0 - shift1); /* mask out the consumed bits: */ bitPosition -= remaining1; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); index = result1; goto l2; } @@ -270,13 +274,13 @@ /* begin nextBits: */ result2 = 0; remaining2 = bitsPerSample; - while (1) { + while(1) { shift2 = remaining2 - bitPosition; - result2 += ((shift2 < 0) ? ((usqInt) currentByte >> -shift2) : ((usqInt) currentByte << shift2)); if (shift2 > 0) { /* consumed currentByte buffer; fetch next byte */ + result2 += currentByte << shift2; remaining2 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; @@ -285,11 +289,12 @@ /* still some bits left in currentByte buffer */ + result2 += ((usqInt) currentByte) >> (0 - shift2); /* mask out the consumed bits: */ bitPosition -= remaining2; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); delta = result2; goto l3; } @@ -439,13 +444,13 @@ /* begin nextBits: */ result = 0; remaining = 16; - while (1) { + while(1) { shift = remaining - bitPosition; - result += ((shift < 0) ? ((usqInt) currentByte >> -shift) : ((usqInt) currentByte << shift)); if (shift > 0) { /* consumed currentByte buffer; fetch next byte */ + result += currentByte << shift; remaining -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; @@ -454,11 +459,12 @@ /* still some bits left in currentByte buffer */ + result += ((usqInt) currentByte) >> (0 - shift); /* mask out the consumed bits: */ bitPosition -= remaining; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); predictedLeft = result; goto l1; } @@ -467,13 +473,13 @@ /* begin nextBits: */ result1 = 0; remaining1 = 6; - while (1) { + while(1) { shift1 = remaining1 - bitPosition; - result1 += ((shift1 < 0) ? ((usqInt) currentByte >> -shift1) : ((usqInt) currentByte << shift1)); if (shift1 > 0) { /* consumed currentByte buffer; fetch next byte */ + result1 += currentByte << shift1; remaining1 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; @@ -482,11 +488,12 @@ /* still some bits left in currentByte buffer */ + result1 += ((usqInt) currentByte) >> (0 - shift1); /* mask out the consumed bits: */ bitPosition -= remaining1; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); indexLeft = result1; goto l2; } @@ -495,13 +502,13 @@ /* begin nextBits: */ result2 = 0; remaining2 = 16; - while (1) { + while(1) { shift2 = remaining2 - bitPosition; - result2 += ((shift2 < 0) ? ((usqInt) currentByte >> -shift2) : ((usqInt) currentByte << shift2)); if (shift2 > 0) { /* consumed currentByte buffer; fetch next byte */ + result2 += currentByte << shift2; remaining2 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; @@ -510,11 +517,12 @@ /* still some bits left in currentByte buffer */ + result2 += ((usqInt) currentByte) >> (0 - shift2); /* mask out the consumed bits: */ bitPosition -= remaining2; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); predictedRight = result2; goto l3; } @@ -523,13 +531,13 @@ /* begin nextBits: */ result3 = 0; remaining3 = 6; - while (1) { + while(1) { shift3 = remaining3 - bitPosition; - result3 += ((shift3 < 0) ? ((usqInt) currentByte >> -shift3) : ((usqInt) currentByte << shift3)); if (shift3 > 0) { /* consumed currentByte buffer; fetch next byte */ + result3 += currentByte << shift3; remaining3 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; @@ -538,11 +546,12 @@ /* still some bits left in currentByte buffer */ + result3 += ((usqInt) currentByte) >> (0 - shift3); /* mask out the consumed bits: */ bitPosition -= remaining3; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); indexRight = result3; goto l4; } @@ -561,13 +570,13 @@ /* begin nextBits: */ result4 = 0; remaining4 = bitsPerSample; - while (1) { + while(1) { shift4 = remaining4 - bitPosition; - result4 += ((shift4 < 0) ? ((usqInt) currentByte >> -shift4) : ((usqInt) currentByte << shift4)); if (shift4 > 0) { /* consumed currentByte buffer; fetch next byte */ + result4 += currentByte << shift4; remaining4 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; @@ -576,11 +585,12 @@ /* still some bits left in currentByte buffer */ + result4 += ((usqInt) currentByte) >> (0 - shift4); /* mask out the consumed bits: */ bitPosition -= remaining4; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); deltaLeft = result4; goto l5; } @@ -589,13 +599,13 @@ /* begin nextBits: */ result5 = 0; remaining5 = bitsPerSample; - while (1) { + while(1) { shift5 = remaining5 - bitPosition; - result5 += ((shift5 < 0) ? ((usqInt) currentByte >> -shift5) : ((usqInt) currentByte << shift5)); if (shift5 > 0) { /* consumed currentByte buffer; fetch next byte */ + result5 += currentByte << shift5; remaining5 -= bitPosition; currentByte = encodedBytes[(byteIndex += 1)]; bitPosition = 8; @@ -604,11 +614,12 @@ /* still some bits left in currentByte buffer */ + result5 += ((usqInt) currentByte) >> (0 - shift5); /* mask out the consumed bits: */ bitPosition -= remaining5; - currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8)))); + currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); deltaRight = result5; goto l6; } @@ -771,31 +782,32 @@ /* begin nextBits:put: */ buf = p; bufBits = 16; - while (1) { + while(1) { bitsAvailable = 8 - bitPosition; /* either left or right shift */ /* append high bits of buf to end of currentByte: */ shift = bitsAvailable - bufBits; - currentByte += ((shift < 0) ? ((usqInt) buf >> -shift) : ((usqInt) buf << shift)); if (shift < 0) { /* currentByte buffer filled; output it */ + currentByte += ((usqInt) buf) >> (0 - shift); encodedBytes[(byteIndex += 1)] = currentByte; bitPosition = 0; /* clear saved high bits of buf: */ currentByte = 0; - buf = buf & (((((0 - shift) < 0) ? ((usqInt) 1 >> -(0 - shift)) : ((usqInt) 1 << (0 - shift)))) - 1); + buf = buf & ((1 << (0 - shift)) - 1); bufBits -= bitsAvailable; } else { /* still some bits available in currentByte buffer */ + currentByte += buf << shift; bitPosition += bufBits; goto l1; } @@ -820,31 +832,32 @@ /* begin nextBits:put: */ buf1 = index; bufBits1 = 6; - while (1) { + while(1) { bitsAvailable1 = 8 - bitPosition; /* either left or right shift */ /* append high bits of buf to end of currentByte: */ shift1 = bitsAvailable1 - bufBits1; - currentByte += ((shift1 < 0) ? ((usqInt) buf1 >> -shift1) : ((usqInt) buf1 << shift1)); if (shift1 < 0) { /* currentByte buffer filled; output it */ + currentByte += ((usqInt) buf1) >> (0 - shift1); encodedBytes[(byteIndex += 1)] = currentByte; bitPosition = 0; /* clear saved high bits of buf: */ currentByte = 0; - buf1 = buf1 & (((((0 - shift1) < 0) ? ((usqInt) 1 >> -(0 - shift1)) : ((usqInt) 1 << (0 - shift1)))) - 1); + buf1 = buf1 & ((1 << (0 - shift1)) - 1); bufBits1 -= bitsAvailable1; } else { /* still some bits available in currentByte buffer */ + currentByte += buf1 << shift1; bitPosition += bufBits1; goto l2; } @@ -907,31 +920,32 @@ /* begin nextBits:put: */ buf2 = sign | delta; bufBits2 = bitsPerSample; - while (1) { + while(1) { bitsAvailable2 = 8 - bitPosition; /* either left or right shift */ /* append high bits of buf to end of currentByte: */ shift2 = bitsAvailable2 - bufBits2; - currentByte += ((shift2 < 0) ? ((usqInt) buf2 >> -shift2) : ((usqInt) buf2 << shift2)); if (shift2 < 0) { /* currentByte buffer filled; output it */ + currentByte += ((usqInt) buf2) >> (0 - shift2); encodedBytes[(byteIndex += 1)] = currentByte; bitPosition = 0; /* clear saved high bits of buf: */ currentByte = 0; - buf2 = buf2 & (((((0 - shift2) < 0) ? ((usqInt) 1 >> -(0 - shift2)) : ((usqInt) 1 << (0 - shift2)))) - 1); + buf2 = buf2 & ((1 << (0 - shift2)) - 1); bufBits2 -= bitsAvailable2; } else { /* still some bits available in currentByte buffer */ + currentByte += buf2 << shift2; bitPosition += bufBits2; goto l3; } Modified: branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,9 +1,17 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795 + ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 + ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 + SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\ +Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795\n\ +ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ +ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ +SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c " __DATE__ ; @@ -87,9 +95,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.235 (i)" + "MiscPrimitivePlugin VMMaker.oscog-eem.248 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.235 (e)" + "MiscPrimitivePlugin VMMaker.oscog-eem.248 (e)" #endif ; Modified: branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c =================================================================== --- branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,9 +1,11 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - SoundGenerationPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + SoundGenerationPlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + AbstractSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c */ -static char __buildInfo[] = "SoundGenerationPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "SoundGenerationPlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\ +AbstractSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c " __DATE__ ; @@ -93,9 +95,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundGenerationPlugin VMMaker.oscog-eem.235 (i)" + "SoundGenerationPlugin VMMaker.oscog-eem.248 (i)" #else - "SoundGenerationPlugin VMMaker.oscog-eem.235 (e)" + "SoundGenerationPlugin VMMaker.oscog-eem.248 (e)" #endif ; Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/cogit.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 + CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 + StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -15074,7 +15074,7 @@ static sqInt registerMaskFor(sqInt reg) { - return (((1 - reg) < 0) ? ((usqInt) 1 >> -(1 - reg)) : ((usqInt) 1 << (1 - reg))); + return 1 << (1 - reg); } @@ -15084,7 +15084,7 @@ static sqInt registerMaskForand(sqInt reg1, sqInt reg2) { - return ((((1 - reg1) < 0) ? ((usqInt) 1 >> -(1 - reg1)) : ((usqInt) 1 << (1 - reg1)))) | ((((1 - reg2) < 0) ? ((usqInt) 1 >> -(1 - reg2)) : ((usqInt) 1 << (1 - reg2)))); + return (1 << (1 - reg1)) | (1 << (1 - reg2)); } @@ -15094,7 +15094,7 @@ static sqInt registerMaskForandand(sqInt reg1, sqInt reg2, sqInt reg3) { - return (((((1 - reg1) < 0) ? ((usqInt) 1 >> -(1 - reg1)) : ((usqInt) 1 << (1 - reg1)))) | ((((1 - reg2) < 0) ? ((usqInt) 1 >> -(1 - reg2)) : ((usqInt) 1 << (1 - reg2))))) | ((((1 - reg3) < 0) ? ((usqInt) 1 >> -(1 - reg3)) : ((usqInt) 1 << (1 - reg3)))); + return ((1 << (1 - reg1)) | (1 << (1 - reg2))) | (1 << (1 - reg3)); } static sqInt Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/cogit.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 + CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/cogmethod.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 + CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/cointerp.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1918,7 +1918,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.246]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.248]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5925,7 +5925,7 @@ /* don't ask if one should compile a second time... */ - GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2))); + GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2); } } } @@ -44610,7 +44610,7 @@ static sqInt stackPageByteSize(void) { - return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)))); + return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)); } Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/cointerp.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/cointerpmt.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - CoInterpreterMT VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2017,7 +2017,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.246]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.248]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -6026,7 +6026,7 @@ /* don't ask if one should compile a second time... */ - GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2))); + GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2); } } } @@ -46060,7 +46060,7 @@ static sqInt stackPageByteSize(void) { - return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)))); + return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)); } Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/cointerpmt.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ Modified: branches/Cog/src/vm/exampleSqNamedPrims.h =================================================================== --- branches/Cog/src/vm/exampleSqNamedPrims.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/exampleSqNamedPrims.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* This is an automatically generated table of all builtin modules in the VM - CoInterpreterMT VMMaker.oscog-eem.243 + CoInterpreterMT VMMaker.oscog-eem.248 */ extern sqExport vm_exports[]; Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1921,7 +1921,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.246]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.248]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5934,7 +5934,7 @@ /* don't ask if one should compile a second time... */ - GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2))); + GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2); } } } @@ -44619,7 +44619,7 @@ static sqInt stackPageByteSize(void) { - return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)))); + return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)); } Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-03 22:00:52 UTC (rev 2655) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 from - CoInterpreterMT VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2020,7 +2020,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.246]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.248]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -6035,7 +6035,7 @@ /* don't ask if one should compile a second time... */ - GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2))); + GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2); } } } @@ -46069,7 +46069,7 @@ static sqInt stackPageByteSize(void) { - return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)))); + return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)); } Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/interp.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-01-03 04:59:02 UTC (rev 2654) +++ branches/Cog/src/vm/vmCallback.h 2013-01-03 22:00:52 UTC (rev 2655) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 */ #define VM_CALLBACK_INC 1

1 0

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 January 2013