Vm-dev October 2015

vm-dev@lists.squeakfoundation.org

29 participants
86 discussions

[Patch] FilePlugin for Windows can now delete read-only files
by Max Leske 20 Oct '15

20 Oct '15

Hi, I just submitted a patch for the FilePlugin that enables deletion of read-only files on Windows. With this patch the VM treats deletion of read-only files on Windows the same way it does on *nix systems (except for the issue of open file handles, but that’s another story…). This patch is especially important for dealing with external tools (e.g. Git) which mark private files as read-only. http://bugs.squeak.org/view.php?id=7836 Cheers, Max

2 1

VM Maker: VMMaker.oscog-rmacnak.1495.mcz
by commits＠source.squeak.org 20 Oct '15

20 Oct '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1495.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1495 Author: rmacnak Time: 19 October 2015, 9:15:56.71 pm UUID: 1bac6ffc-4f19-447a-9236-c8b9be3b7936 Ancestors: VMMaker.oscog-rmacnak.1494 Sync NewsqueakIA32ABIPlugin with IA32ABIPlugin. =============== Diff against VMMaker.oscog-rmacnak.1494 =============== Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primAllocateExecutablePage (in category 'primitives-memory management') ----- primAllocateExecutablePage "Answer an Alien for an executable page; for thunks" "primAllocateExecutablePage ^<Alien> <primitive: 'primAllocateExecutablePage' error: errorCode module: 'IA32ABI'>" | byteSize ptr mem alien | <export: true> <var: #byteSize type: 'long'> <var: #ptr type: 'long *'> <var: #mem type: 'void *'> self cCode: 'mem = allocateExecutablePage(&byteSize)' inSmalltalk: [self error: 'not yet implemented'. mem := 0. byteSize := 0]. mem = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoCMemory]. alien := interpreterProxy instantiateClass: interpreterProxy classAlien + indexableSize: 2 * interpreterProxy bytesPerOop. - indexableSize: 8. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. ptr := interpreterProxy firstIndexableField: alien. ptr at: 0 put: 0 - byteSize. "indirect mem indicated by negative size. Slang doesn't grok negated" ptr at: 1 put: (self cCoerce: mem to: 'long'). interpreterProxy methodReturnValue: alien! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primSignedLongAt (in category 'primitives-accessing') ----- primSignedLongAt "Answer the signed 32-bit integer starting at the given byte offset (little endian)." "<Alien> signedLongAt: index <Integer> ^<Integer> <primitive: 'primSignedLongAt' error: errorCode module: 'IA32ABI'>" | byteOffset rcvr startAddr addr value valueOop | <export: true> byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 0) - 1. rcvr := interpreterProxy stackObjectValue: 1. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. (self index: byteOffset length: 4 inRange: rcvr) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. (startAddr := self startOfData: rcvr) = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. addr := startAddr + byteOffset. + value := self long32At: addr. - value := self longAt: addr. valueOop := interpreterProxy signed32BitIntegerFor: value. ^interpreterProxy methodReturnValue: valueOop! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primSignedLongAtPut (in category 'primitives-accessing') ----- primSignedLongAtPut "Store a signed integer into 32 bits starting at the given byte offset (little endian)." "<Alien> signedLongAt: index <Integer> put: value <Integer> ^<Integer> <primitive: 'primSignedLongAtPut' error: errorCode module: 'IA32ABI'>" | byteOffset rcvr startAddr addr value valueOop | <export: true> valueOop := interpreterProxy stackValue: 0. byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 1) - 1. rcvr := interpreterProxy stackObjectValue: 2. value := interpreterProxy signed32BitValueOf: valueOop. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. (self index: byteOffset length: 4 inRange: rcvr) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. (interpreterProxy isOopImmutable: rcvr) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoModification]. (startAddr := self startOfData: rcvr) = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. addr := startAddr + byteOffset. + self long32At: addr put: value. - self longAt: addr put: value. ^interpreterProxy methodReturnValue: valueOop! Item was added: + ----- Method: NewsqueakIA32ABIPlugin>>primSignedWordAt (in category 'primitives-accessing') ----- + primSignedWordAt + "Answer the signed word starting at the given byte offset (little endian)." + "<Alien> signedWordAt: index <Integer> ^<Integer> + <primitive: 'primSignedWordAt' error: errorCode module: 'IA32ABI'>" + | byteOffset rcvr startAddr addr value valueOop | + <export: true> + + byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 0) - 1. + rcvr := interpreterProxy stackObjectValue: 1. + interpreterProxy failed ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + (self index: byteOffset length: interpreterProxy bytesPerOop inRange: rcvr) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. + (startAddr := self startOfData: rcvr) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + addr := startAddr + byteOffset. + value := self longAt: addr. + valueOop := interpreterProxy signedMachineIntegerValueOf: value. + ^interpreterProxy methodReturnValue: valueOop! Item was added: + ----- Method: NewsqueakIA32ABIPlugin>>primSignedWordAtPut (in category 'primitives-accessing') ----- + primSignedWordAtPut + "Store a signed integer into the word starting at the given byte offset (little endian)." + "<Alien> signedWordAt: index <Integer> put: value <Integer> ^<Integer> + <primitive: 'primSignedWordAtPut' error: errorCode module: 'IA32ABI'>" + | byteOffset rcvr startAddr addr value valueOop | + <export: true> + + valueOop := interpreterProxy stackValue: 0. + byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 1) - 1. + rcvr := interpreterProxy stackObjectValue: 2. + value := interpreterProxy signedMachineIntegerValueOf: valueOop. + interpreterProxy failed ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + (self index: byteOffset length: interpreterProxy bytesPerOop inRange: rcvr) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. + (interpreterProxy isOopImmutable: rcvr) ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrNoModification]. + (startAddr := self startOfData: rcvr) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + addr := startAddr + byteOffset. + self longAt: addr put: value. + ^interpreterProxy methodReturnValue: valueOop! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primStrlenThroughPointerAtIndex (in category 'primitives-accessing') ----- primStrlenThroughPointerAtIndex "Answer the number of non-null bytes starting at the byte addressed by the 4-byte pointer at index." "<Alien> strlenThroughPointerAt: index <Integer> ^<Integer> <primitive: 'primStrlenThroughPointerAtIndex' error: errorCode module: 'IA32ABI'>" | byteOffset rcvr ptr addr | <export: true> <var: #ptr type: #'char *'> byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 0) - 1. rcvr := interpreterProxy stackObjectValue: 1. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + (self index: byteOffset length: interpreterProxy bytesPerOop inRange: rcvr) ifFalse: - (self index: byteOffset length: 4 inRange: rcvr) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. addr := (self startOfData: rcvr) + byteOffset. ptr := self cCoerce: (self longAt: addr) to: #'char *'. ^interpreterProxy methodReturnValue: (interpreterProxy positive32BitIntegerFor: (self strlen: ptr))! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primUnsignedLongAt (in category 'primitives-accessing') ----- primUnsignedLongAt "Answer the unsigned 32-bit integer starting at the given byte offset (little endian)." "<Alien> unsignedLongAt: index <Integer> ^<Integer> <primitive: 'primUnsignedLongAt' error: errorCode module: 'IA32ABI'>" | byteOffset rcvr startAddr addr value valueOop | <export: true> byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 0) - 1. rcvr := interpreterProxy stackObjectValue: 1. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. (self index: byteOffset length: 4 inRange: rcvr) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. (startAddr := self startOfData: rcvr) = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. addr := startAddr + byteOffset. + value := self long32At: addr. - value := self longAt: addr. valueOop := interpreterProxy positive32BitIntegerFor: value. ^interpreterProxy methodReturnValue: valueOop! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primUnsignedLongAtPut (in category 'primitives-accessing') ----- primUnsignedLongAtPut "Store an unsigned integer into 32 bits starting at the given byte offset (little endian)." "<Alien> unsignedLongAt: index <Integer> put: value <Integer> ^<Integer> <primitive: 'primUnsignedLongAtPut' error: errorCode module: 'IA32ABI'>" | byteOffset rcvr startAddr addr value valueOop | <export: true> valueOop := interpreterProxy stackValue: 0. byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 1) - 1. rcvr := interpreterProxy stackObjectValue: 2. value := interpreterProxy positive32BitValueOf: valueOop. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. (self index: byteOffset length: 4 inRange: rcvr) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. (interpreterProxy isOopImmutable: rcvr) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoModification]. (startAddr := self startOfData: rcvr) = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. addr := startAddr + byteOffset. + self long32At: addr put: value. - self longAt: addr put: value. ^interpreterProxy methodReturnValue: valueOop! Item was added: + ----- Method: NewsqueakIA32ABIPlugin>>primUnsignedWordAt (in category 'primitives-accessing') ----- + primUnsignedWordAt + "Answer the unsigned word starting at the given byte offset (little endian)." + "<Alien> unsignedWordAt: index <Integer> ^<Integer> + <primitive: 'primUnsignedWordAt' error: errorCode module: 'IA32ABI'>" + | byteOffset rcvr startAddr addr value valueOop | + <export: true> + + byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 0) - 1. + rcvr := interpreterProxy stackObjectValue: 1. + interpreterProxy failed ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + (self index: byteOffset length: interpreterProxy bytesPerOop inRange: rcvr) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. + (startAddr := self startOfData: rcvr) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + addr := startAddr + byteOffset. + value := self longAt: addr. + valueOop := interpreterProxy positiveMachineIntegerFor: value. + ^interpreterProxy methodReturnValue: valueOop! Item was added: + ----- Method: NewsqueakIA32ABIPlugin>>primUnsignedWordAtPut (in category 'primitives-accessing') ----- + primUnsignedWordAtPut + "Store an unsigned integer into 32 bits starting at the given byte offset (little endian)." + "<Alien> unsignedWordAt: index <Integer> put: value <Integer> ^<Integer> + <primitive: 'primUnsignedWordAtPut' error: errorCode module: 'IA32ABI'>" + | byteOffset rcvr startAddr addr value valueOop | + <export: true> + + valueOop := interpreterProxy stackValue: 0. + byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 1) - 1. + rcvr := interpreterProxy stackObjectValue: 2. + value := interpreterProxy positiveMachineIntegerValueOf: valueOop. + interpreterProxy failed ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + (self index: byteOffset length: interpreterProxy bytesPerOop inRange: rcvr) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. + (interpreterProxy isOopImmutable: rcvr) ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrNoModification]. + (startAddr := self startOfData: rcvr) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + addr := startAddr + byteOffset. + self longAt: addr put: value. + ^interpreterProxy methodReturnValue: valueOop!

1 0

VM Maker: VMMaker.oscog-rmacnak.1494.mcz
by commits＠source.squeak.org 20 Oct '15

20 Oct '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1494.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1494 Author: rmacnak Time: 19 October 2015, 8:40:22.914 pm UUID: b288db64-85ad-44a1-b406-da026226b4fc Ancestors: VMMaker.oscog-eem.1493 Fix missing primitive failure for Alien typeAt: 0 [put:]. =============== Diff against VMMaker.oscog-eem.1493 =============== Item was changed: ----- Method: IA32ABIPlugin>>index:length:inRange: (in category 'private-support') ----- index: byteIndex length: length inRange: rcvr + "Answer if the indices byteIndex to byteIndex + length - 1 are valid zero-relative indices into the rcvr." - "Answer if the indices byteIndex to byteIndex + length - 1 are valid zero-relative indices into the rcvr. - N.B. This code only works when translated because asUnisgnedInteger only works for non-negative - values. Hence the override in IA32ABIPluginSimulator." | dataSize | <inline: true> + dataSize := self sizeField: rcvr. + ^dataSize = 0 or: [byteIndex >= 0 and: [(byteIndex + length) <= dataSize abs]]! - ^(dataSize := self sizeField: rcvr) = 0 - or: [byteIndex asUnsignedInteger + length <= dataSize abs]! Item was removed: - ----- Method: IA32ABIPluginSimulator>>index:length:inRange: (in category 'private-support') ----- - index: byteIndex length: length inRange: rcvr - "Answer if the indices byteIndex to byteIndex + length - 1 are valid zero-relative indices into the rcvr." - | dataSize | - <inline: true> - dataSize := self sizeField: rcvr. - ^dataSize = 0 or: [byteIndex > 0 and: [byteIndex + length <= dataSize abs]]! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>index:length:inRange: (in category 'private-support') ----- index: byteIndex length: length inRange: rcvr + "Answer if the indices byteIndex to byteIndex + length - 1 are valid zero-relative indices into the rcvr." - "Answer if the indices byteIndex to byteIndex + length - 1 are valid zero-relative indices into the rcvr. - N.B. This code only works when translated because asUnisgnedInteger only works for non-negative - values. Hence the override in NewsqueakIA32ABIPluginSimulator." | dataSize | <inline: true> + dataSize := self sizeField: rcvr. + ^dataSize = 0 or: [byteIndex >= 0 and: [(byteIndex + length) <= dataSize abs]]! - ^(dataSize := self sizeField: rcvr) = 0 - or: [byteIndex asUnsignedInteger + length <= dataSize abs]! Item was removed: - ----- Method: NewsqueakIA32ABIPluginSimulator>>index:length:inRange: (in category 'private-support') ----- - index: byteIndex length: length inRange: rcvr - "Answer if the indices byteIndex to byteIndex + length - 1 are valid zero-relative indices into the rcvr." - | dataSize | - <inline: true> - dataSize := self sizeField: rcvr. - ^dataSize = 0 or: [byteIndex > 0 and: [byteIndex + length <= dataSize abs]]!

1 0

[commit][3477] JMM - eliminate leaks on 32bit platform
by commits＠squeakvm.org 20 Oct '15

20 Oct '15

Revision: 3477 Author: johnmci Date: 2015-10-19 17:51:42 -0700 (Mon, 19 Oct 2015) Log Message: ----------- JMM - eliminate leaks on 32bit platform Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m branches/Cog/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.m branches/Cog/platforms/iOS/vm/Common/Classes/Queue.m branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.m branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m branches/Cog/platforms/iOS/vm/OSX/SqViewBitmapConversion.m branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m branches/Cog/platforms/iOS/vm/OSX/plugins/HostWindowPlugin/sqMacHostWindow.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+clipboard.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXFileDirectoryInterface.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate =================================================================== (Binary files differ) Modified: branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m =================================================================== --- branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -75,8 +75,8 @@ void sqPasteboardPutItemFlavordatalengthformatTypeformatLength ( CLIPBOARDTYPE inPasteboard, char* inData, sqInt dataLength, char* format, sqInt formatLength) { - NSString *formatType = [[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding]; - NSData* data = [[NSData alloc ] initWithBytes: inData length: dataLength]; + NSString *formatType = [[[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding] AUTORELEASEOBJ]; + NSData* data = [[[NSData alloc ] initWithBytes: inData length: dataLength] AUTORELEASEOBJ]; NSArray *arrayOfTypes = @[formatType]; [inPasteboard declareTypes: arrayOfTypes owner: nil]; @@ -86,7 +86,7 @@ sqInt sqPasteboardCopyItemFlavorDataformatformatLength ( CLIPBOARDTYPE inPasteboard, char* format, sqInt formatLength) { - NSString *formatType = [[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding]; + NSString *formatType = [[[NSString alloc] initWithBytes: format length: formatLength encoding: NSUTF8StringEncoding] AUTORELEASEOBJ]; NSArray *arrayOfTypes = @[formatType]; NSString *type= [inPasteboard availableTypeFromArray: arrayOfTypes]; Modified: branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m =================================================================== --- branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -114,7 +114,7 @@ return; if (inNumberPacketDescriptions > 0) { - soundAtom *atom = [[soundAtom alloc] initWith: inBuffer->mAudioData count: inBuffer->mAudioDataByteSize]; + soundAtom *atom = [[[soundAtom alloc] initWith: inBuffer->mAudioData count: inBuffer->mAudioDataByteSize] AUTORELEASEOBJ]; [myInstance.soundInQueue addItem: atom]; } @@ -145,6 +145,7 @@ data = 0; byteCount = 0; startOffset = 0; + SUPERDEALLOC } @end @@ -280,7 +281,7 @@ OSStatus result = AudioQueueDispose (self.outputAudioQueue,true); #pragma unused(result) self.outputAudioQueue = nil; - self.soundOutQueue = [[Queue alloc] init]; + self.soundOutQueue = [[[Queue alloc] init] AUTORELEASEOBJ]; return 1; } @@ -307,7 +308,7 @@ return interpreterProxy->primitiveFail(); //NSLog(@"%i sound place samples on queue frames %i startIndex %i count %i",ioMSecs(),frameCount,startIndex,byteCount-startIndex); - soundAtom *atom = [[soundAtom alloc] initWith: arrayIndex+startIndex count: (unsigned) (byteCount-startIndex)]; + soundAtom *atom = [[[soundAtom alloc] initWith: arrayIndex+startIndex count: (unsigned) (byteCount-startIndex)] AUTORELEASEOBJ]; [self.soundOutQueue addItem: atom]; if (!self.outputIsRunning) { @@ -395,7 +396,7 @@ return 0; result = AudioQueueDispose (self.inputAudioQueue,true); self.inputAudioQueue = nil; - self.soundInQueue = [[Queue alloc] init]; + self.soundInQueue = [[[Queue alloc] init] AUTORELEASEOBJ]; return 1; } Modified: branches/Cog/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.m =================================================================== --- branches/Cog/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/plugins/SqueakObjectiveC/squeakProxy.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -71,8 +71,8 @@ [self setTarget: dummy]; } - lockForSqueak = [[NSConditionLock alloc] initWithCondition: 0]; - sigs = [[NSMutableDictionary alloc] initWithCapacity: 10]; + self.lockForSqueak = [[NSConditionLock alloc] initWithCondition: 0]; + self.sigs = [[NSMutableDictionary alloc] initWithCapacity: 10]; isCarbonVM = NO; callbackid = 0; @@ -92,11 +92,11 @@ return; } - if([lockForSqueak lockWhenCondition: 0 beforeDate: (timeout = [[NSDate alloc] initWithTimeIntervalSinceNow: 3.0])]) + if([lockForSqueak lockWhenCondition: 0 beforeDate: (timeout = [[[NSDate alloc] initWithTimeIntervalSinceNow: 3.0] AUTORELEASEOBJ])]) { // NSLog(@"inside lock 0"); [lockForSqueak unlockWithCondition: 1]; - invocation = anInvocation; + invocation = [anInvocation RETAINOBJ]; // NSLog(@"signalling squeak"); interpreterProxy->signalSemaphoreWithIndex(sem); @@ -104,7 +104,7 @@ if (isCarbonVM) interpreterProxy->callbackEnter(&callbackid); - if([lockForSqueak lockWhenCondition: 2 beforeDate: (timeout = [[NSDate alloc] initWithTimeIntervalSinceNow: 5.0])]) + if([lockForSqueak lockWhenCondition: 2 beforeDate: (timeout = [[[NSDate alloc] initWithTimeIntervalSinceNow: 5.0] AUTORELEASEOBJ])] ) { // NSLog(@"inside lock 2"); invocation = nil; @@ -187,6 +187,13 @@ isCarbonVM = YES; } +- (void) dealloc +{ + [lockForSqueak RELEASEOBJ]; + [sigs RELEASEOBJ]; + [target RELEASEOBJ]; + SUPERDEALLOC +} @end Modified: branches/Cog/platforms/iOS/vm/Common/Classes/Queue.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/Queue.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/Common/Classes/Queue.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -71,6 +71,12 @@ return self; } +- (void) dealloc +{ + [mItemArray RELEASEOBJ]; + SUPERDEALLOC +} + // Returns (and removes) the oldest item in the queue -(id)returnAndRemoveOldest { Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -44,6 +44,11 @@ @implementation sqSqueakAppDelegate @synthesize squeakApplication,squeakThread; +- (void)dealloc { + [squeakApplication RELEASEOBJ]; + SUPERDEALLOC +} + - (void) makeMainWindow { /*Beware creating a main window must be done on main thread it will not work from this interpreter squeak thread */ Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -191,22 +191,19 @@ NSString* createFilePathFromString(char * aFilenameString, sqInt filenameLength, sqInt resolveAlias) { - NSString * filePath = [[NSString alloc] initWithBytes: aFilenameString length: (NSUInteger) filenameLength encoding: NSUTF8StringEncoding]; + NSString * filePath = [[[NSString alloc] initWithBytes: aFilenameString length: (NSUInteger) filenameLength encoding: NSUTF8StringEncoding] AUTORELEASEOBJ]; if (!filePath) { - [filePath RELEASEOBJ]; return NULL; } - NSString *oldFilePath = filePath; if (resolveAlias) { filePath = [gDelegateApp.squeakApplication.fileDirectoryLogic resolvedAliasFiles: filePath]; - [oldFilePath RELEASEOBJ]; } else { NSString *owningDirectoryPath = [filePath stringByDeletingLastPathComponent]; NSString *newFilePath = [gDelegateApp.squeakApplication.fileDirectoryLogic resolvedAliasFiles: owningDirectoryPath]; filePath = [newFilePath stringByAppendingPathComponent: [filePath lastPathComponent]]; } - [oldFilePath RELEASEOBJ]; + [filePath RETAINOBJ]; return filePath; } Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -375,4 +375,11 @@ return filePath; } +- (void)dealloc { + SUPERDEALLOC + [lastPathForDirLookup RELEASEOBJ]; + [directoryContentsForDirLookup RELEASEOBJ]; +} + + @end Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakInfoPlistInterface.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -55,9 +55,9 @@ return; } -//- (void)dealloc { -// [super dealloc]; -// [defaults release]; -//} +- (void)dealloc { + [defaults RELEASEOBJ]; + SUPERDEALLOC +} @end Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -227,6 +227,7 @@ - (void)dealloc { sqMacMemoryFree(); + SUPERDEALLOC } @end Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAndWindow.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -206,5 +206,6 @@ if (blip) { [blip invalidate]; } + SUPERDEALLOC } @end Modified: branches/Cog/platforms/iOS/vm/OSX/SqViewBitmapConversion.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/SqViewBitmapConversion.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/SqViewBitmapConversion.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -64,7 +64,7 @@ copyImage1To32(srcBits, dBits, srcPixelWidth, height, left, top, right, bottom,colorMap); - CHECKANDRETURN([[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits + CHECKANDRETURN([[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits pixelsWide:right-left pixelsHigh:bottom-top bitsPerSample:bitsPerSample @@ -73,7 +73,7 @@ isPlanar:NO colorSpaceName:colorSpace bytesPerRow:bytesPerRow - bitsPerPixel:bitsPerPixel]); + bitsPerPixel:bitsPerPixel] AUTORELEASEOBJ]); }//extractPixels_1_to_32; @@ -96,7 +96,7 @@ copyImage2To32(srcBits, dBits, srcPixelWidth, height, left, top, right, bottom,colorMap); - CHECKANDRETURN([[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits + CHECKANDRETURN([[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits pixelsWide:right-left pixelsHigh:bottom-top bitsPerSample:bitsPerSample @@ -105,7 +105,7 @@ isPlanar:NO colorSpaceName:colorSpace bytesPerRow:bytesPerRow - bitsPerPixel:bitsPerPixel]); + bitsPerPixel:bitsPerPixel] AUTORELEASEOBJ]); }//extractPixels_2_to_32; -(CGImageRef)extractPixels_4_to_32:(void*)srcBits @@ -127,7 +127,7 @@ copyImage4To32(srcBits, dBits, srcPixelWidth, height, left, top, right, bottom,colorMap); - CHECKANDRETURN([[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits + CHECKANDRETURN([[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits pixelsWide:right-left pixelsHigh:bottom-top bitsPerSample:bitsPerSample @@ -136,7 +136,7 @@ isPlanar:NO colorSpaceName:colorSpace bytesPerRow:bytesPerRow - bitsPerPixel:bitsPerPixel]); + bitsPerPixel:bitsPerPixel] AUTORELEASEOBJ]); }//extractPixels_4_to_32; @@ -159,7 +159,7 @@ copyImage8To32(srcBits, dBits, srcPixelWidth, height, left, top, right, bottom,colorMap); - CHECKANDRETURN([[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits + CHECKANDRETURN([[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits pixelsWide:right-left pixelsHigh:bottom-top bitsPerSample:bitsPerSample @@ -168,7 +168,7 @@ isPlanar:NO colorSpaceName:colorSpace bytesPerRow:bytesPerRow - bitsPerPixel:bitsPerPixel]); + bitsPerPixel:bitsPerPixel] AUTORELEASEOBJ]); }//extractPixels_8_to_32; @@ -189,7 +189,7 @@ copyImage16To32(srcBits, dBits, srcPixelWidth, height, left, top, right, bottom); - CHECKANDRETURN([[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits + CHECKANDRETURN([[[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **)&dBits pixelsWide:right-left pixelsHigh:bottom-top bitsPerSample:bitsPerSample @@ -198,7 +198,7 @@ isPlanar:NO colorSpaceName:colorSpace bytesPerRow:bytesPerRow - bitsPerPixel:bitsPerPixel]); + bitsPerPixel:bitsPerPixel] AUTORELEASEOBJ]); }//extractPixels_16_to_32; -(CGImageRef)computeBitmapFromBitsIndex:(void*)srcBits Modified: branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -63,7 +63,7 @@ @synthesize window,mainView,possibleImageNameAtLaunchTime,checkForFileNameOnFirstParm,windowHandler; - (sqSqueakMainApplication *) makeApplicationInstance { - return [[sqSqueakOSXApplication alloc] init]; + return [[[sqSqueakOSXApplication alloc] init] AUTORELEASEOBJ]; } - (void)applicationWillFinishLaunching:(NSNotification *)aNotification { @@ -80,8 +80,8 @@ @autoreleasepool { gDelegateApp = self; - squeakApplication = [self makeApplicationInstance]; - self.windowHandler = [[sqSqueakOSXScreenAndWindow alloc] init]; + self.squeakApplication = [self makeApplicationInstance]; + self.windowHandler = [[[sqSqueakOSXScreenAndWindow alloc] init] AUTORELEASEOBJ]; windowHandler.mainViewOnWindow = self.mainView; self.mainView.windowLogic = windowHandler; windowHandler.windowIndex = 1; @@ -176,7 +176,7 @@ //It can right now, I have two implementations to pick (CoreGraphics or OpenGL), muy more/different could be added //in the future. - NSView *view = [[ContentViewClass alloc] initWithFrame:[[self window] frame]]; + NSView *view = [[[ContentViewClass alloc] initWithFrame:[[self window] frame]] AUTORELEASEOBJ]; self.mainView = (id) view; [[self window] setContentView: view]; Modified: branches/Cog/platforms/iOS/vm/OSX/plugins/HostWindowPlugin/sqMacHostWindow.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/plugins/HostWindowPlugin/sqMacHostWindow.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/plugins/HostWindowPlugin/sqMacHostWindow.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -101,7 +101,7 @@ } sqInt ioSetTitleOfWindow(sqInt windowIndex, char * newTitle, sqInt sizeOfTitle) { - NSString *title = [[NSString alloc] initWithBytes:newTitle length:sizeOfTitle encoding:NSUTF8StringEncoding]; + NSString *title = [[[NSString alloc] initWithBytes:newTitle length:sizeOfTitle encoding:NSUTF8StringEncoding] AUTORELEASEOBJ]; [[[NSApplication sharedApplication] mainWindow] setTitle:title]; return 1; } Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+clipboard.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+clipboard.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+clipboard.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -74,7 +74,7 @@ - (void) clipboardWrite: (sqInt) count from: (char *)byteArrayIndex startingAt: (sqInt) startIndex { NSPasteboard *pboard= [NSPasteboard generalPasteboard]; - NSString * string = [[NSString alloc] initWithBytes: byteArrayIndex length:(NSUInteger)count encoding: NSUTF8StringEncoding]; + NSString * string = [[[NSString alloc] initWithBytes: byteArrayIndex length:(NSUInteger)count encoding: NSUTF8StringEncoding] AUTORELEASEOBJ]; [pboard declareTypes: @[NSStringPboardType] owner: nil]; [pboard setString: string forType: NSStringPboardType]; } Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -195,7 +195,7 @@ } } - NSString *lookupString = [[NSString alloc] initWithCharacters: &unicode length: 1]; + NSString *lookupString = [[[NSString alloc] initWithCharacters: &unicode length: 1] AUTORELEASEOBJ]; [lookupString getBytes: &macRomanCharacter maxLength: 1 usedLength: NULL encoding: NSMacOSRomanStringEncoding options: 0 range: picker remainingRange: NULL]; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -126,7 +126,7 @@ } - (void) setupSoundLogic { - self.soundInterfaceLogic = [[sqSqueakOSXSoundCoreAudio alloc] init]; + self.soundInterfaceLogic = [[[sqSqueakOSXSoundCoreAudio alloc] init] AUTORELEASEOBJ]; [(sqSqueakOSXSoundCoreAudio *) self.soundInterfaceLogic soundInitOverride]; snd_Start(2644, 22050, 1, 0); @@ -195,7 +195,7 @@ if ([args count] < 2) return; - NSMutableArray *revisedArgs = [args mutableCopyWithZone: NULL]; + NSMutableArray *revisedArgs = [[args mutableCopyWithZone: NULL] AUTORELEASEOBJ]; [revisedArgs removeObjectAtIndex:0]; NSUInteger i,result; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -73,7 +73,7 @@ NSOpenGLPFABackingStore, 0 }; - return[[NSOpenGLPixelFormat alloc] initWithAttributes:attrs]; + return[[[NSOpenGLPixelFormat alloc] initWithAttributes:attrs] AUTORELEASEOBJ]; } - (id)initWithFrame:(NSRect)frameRect { @@ -113,6 +113,7 @@ - (void) dealloc { free(colorMap32); CGColorSpaceRelease(colorspace); + SUPERDEALLOC } - (BOOL) acceptsFirstResponder { @@ -334,11 +335,11 @@ //http://www.internet4classrooms.com/mac_ext.gif //http://developer.apple.com/legacy/mac/library/documentation/mac/Text/Text-571.html - keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[keyBoardStrokeDetails alloc] init]; + keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[[keyBoardStrokeDetails alloc] init] AUTORELEASEOBJ]; aKeyBoardStrokeDetails.keyCode = [theEvent keyCode]; aKeyBoardStrokeDetails.modifierFlags = [theEvent modifierFlags]; - NSArray *down = [[NSArray alloc] initWithObjects: theEvent,nil]; + NSArray *down = [[[NSArray alloc] initWithObjects: theEvent,nil] AUTORELEASEOBJ]; @synchronized(self) { lastSeenKeyBoardStrokeDetails = aKeyBoardStrokeDetails; @@ -354,11 +355,11 @@ } -(void)keyDown:(NSEvent*)theEvent { - keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[keyBoardStrokeDetails alloc] init]; + keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[[keyBoardStrokeDetails alloc] init] AUTORELEASEOBJ]; aKeyBoardStrokeDetails.keyCode = [theEvent keyCode]; aKeyBoardStrokeDetails.modifierFlags = [theEvent modifierFlags]; - NSArray *down = [[NSArray alloc] initWithObjects: theEvent,nil]; + NSArray *down = [[[NSArray alloc] initWithObjects: theEvent,nil] AUTORELEASEOBJ]; // NSLog(@"sqSqueakOSXCGView.m>>keyDown:"); @synchronized(self) { lastSeenKeyBoardStrokeDetails = aKeyBoardStrokeDetails; @@ -388,7 +389,7 @@ - (void)flagsChanged:(NSEvent *)theEvent { // NSLog(@"sqSqueakOSXCGView.m>>flagsChanged -- %d, %d", [theEvent keyCode], [theEvent modifierFlags] ); - keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[keyBoardStrokeDetails alloc] init]; + keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[[keyBoardStrokeDetails alloc] init] AUTORELEASEOBJ]; aKeyBoardStrokeDetails.keyCode = [theEvent keyCode]; aKeyBoardStrokeDetails.modifierFlags = [theEvent modifierFlags]; self.lastSeenKeyBoardModifierDetails = aKeyBoardStrokeDetails; @@ -463,7 +464,7 @@ else return; @synchronized(self) { - keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[keyBoardStrokeDetails alloc] init]; + keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[[keyBoardStrokeDetails alloc] init] AUTORELEASEOBJ]; aKeyBoardStrokeDetails.keyCode = keyCode; aKeyBoardStrokeDetails.modifierFlags = self.lastSeenKeyBoardModifierDetails.modifierFlags; lastSeenKeyBoardStrokeDetails = aKeyBoardStrokeDetails; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXFileDirectoryInterface.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXFileDirectoryInterface.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXFileDirectoryInterface.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -74,7 +74,7 @@ - (NSString *)resolvedAliasFiles:(NSString *)filePath { NSArray *compoents = [[filePath stringByStandardizingPath] pathComponents]; NSString *thisComponent; - NSString *path = [[NSString alloc] init]; + NSString *path = [[[NSString alloc] init] AUTORELEASEOBJ]; for (thisComponent in compoents) { path = [path stringByAppendingPathComponent:thisComponent]; if (![[NSFileManager defaultManager] fileExistsAtPath:path]) Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -70,7 +70,7 @@ NSOpenGLPFABackingStore, 0 }; - return[[NSOpenGLPixelFormat alloc] initWithAttributes:attrs]; + return[[[NSOpenGLPixelFormat alloc] initWithAttributes:attrs] AUTORELEASEOBJ]; } - (id)initWithFrame:(NSRect)frameRect { @@ -103,6 +103,7 @@ - (void) dealloc { free(colorMap32); CGColorSpaceRelease(colorspace); + SUPERDEALLOC } - (BOOL) acceptsFirstResponder { @@ -414,7 +415,7 @@ //http://www.internet4classrooms.com/mac_ext.gif //http://developer.apple.com/legacy/mac/library/documentation/mac/Text/Text-571.html - keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[keyBoardStrokeDetails alloc] init]; + keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[[keyBoardStrokeDetails alloc] init] AUTORELEASEOBJ]; aKeyBoardStrokeDetails.keyCode = [theEvent keyCode]; aKeyBoardStrokeDetails.modifierFlags = [theEvent modifierFlags]; @@ -432,7 +433,7 @@ } -(void)keyDown:(NSEvent*)theEvent { - keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[keyBoardStrokeDetails alloc] init]; + keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[[keyBoardStrokeDetails alloc] init] AUTORELEASEOBJ]; aKeyBoardStrokeDetails.keyCode = [theEvent keyCode]; aKeyBoardStrokeDetails.modifierFlags = [theEvent modifierFlags]; @@ -461,7 +462,7 @@ } - (void)flagsChanged:(NSEvent *)theEvent { - keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[keyBoardStrokeDetails alloc] init]; + keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[[keyBoardStrokeDetails alloc] init] AUTORELEASEOBJ]; aKeyBoardStrokeDetails.keyCode = [theEvent keyCode]; aKeyBoardStrokeDetails.modifierFlags = [theEvent modifierFlags]; self.lastSeenKeyBoardModifierDetails = aKeyBoardStrokeDetails; @@ -548,7 +549,7 @@ return; @synchronized(self) { - keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[keyBoardStrokeDetails alloc] init]; + keyBoardStrokeDetails *aKeyBoardStrokeDetails = [[[keyBoardStrokeDetails alloc] init] AUTORELEASEOBJ]; aKeyBoardStrokeDetails.keyCode = keyCode; aKeyBoardStrokeDetails.modifierFlags = self.lastSeenKeyBoardModifierDetails.modifierFlags; lastSeenKeyBoardStrokeDetails = aKeyBoardStrokeDetails; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -52,6 +52,10 @@ return self.mainViewOnWindow; } +- (void) dealloc { + [mainViewOnWindow RELEASEOBJ]; + SUPERDEALLOC +} - (void) ioSetFullScreen: (sqInt) fullScreen { [[self getMainView] ioSetFullScreen: fullScreen]; Modified: branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch =================================================================== --- branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch 2015-10-20 00:51:42 UTC (rev 3477) @@ -14,5 +14,5 @@ #define RELEASEOBJ release #define RETAINOBJ retain #define AUTORELEASEOBJ autorelease - +#define SUPERDEALLOC [super dealloc]; #endif \ No newline at end of file Modified: branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m =================================================================== --- branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m 2015-10-19 23:15:48 UTC (rev 3476) +++ branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIViewOpenGL.m 2015-10-20 00:51:42 UTC (rev 3477) @@ -119,7 +119,8 @@ - (void)dealloc { if ([EAGLContext currentContext] == context) [EAGLContext setCurrentContext:nil]; - + self.context = nil; + SUPERDEALLOC } - (void)layoutSubviews {

1 0

[commit][3476] JMM - ensure SqueakCogSpur32x86 will build, start work on leaks under 32bit non-arc systems
by commits＠squeakvm.org 20 Oct '15

20 Oct '15

Revision: 3476 Author: johnmci Date: 2015-10-19 16:15:48 -0700 (Mon, 19 Oct 2015) Log Message: ----------- JMM - ensure SqueakCogSpur32x86 will build, start work on leaks under 32bit non-arc systems Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.plist branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakCogSpur32x86.xcscheme branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+cursor.m branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.plist =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.plist 2015-10-16 17:59:15 UTC (rev 3475) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.plist 2015-10-19 23:15:48 UTC (rev 3476) @@ -380,7 +380,7 @@ <key>CFBundleExecutable</key> <string>Squeak</string> <key>CFBundleGetInfoString</key> - <string>Squeak Stack 5.0.0 http://www.mirandabanda.org</string> + <string>Squeak Cog Spur http://www.mirandabanda.org</string> <key>CFBundleIdentifier</key> <string>org.squeak.osx6464.cog</string> <key>CFBundleInfoDictionaryVersion</key> Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-10-16 17:59:15 UTC (rev 3475) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-10-19 23:15:48 UTC (rev 3476) @@ -11,6 +11,7 @@ 9402DD7010CE0E91005C2102 /* SqViewClut.m in Sources */ = {isa = PBXBuildFile; fileRef = 9402DD6F10CE0E91005C2102 /* SqViewClut.m */; }; 9422C3B51AFFFAC500448DC0 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9422C3B31AFFFAC500448DC0 /* Localizable.strings */; }; 943B9CA11235C5120056205E /* sqMacHostWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 943B9C9E1235C5120056205E /* sqMacHostWindow.m */; }; + 944154941BD595710062FCDE /* sqMacUnixExternalPrims.m in Sources */ = {isa = PBXBuildFile; fileRef = 946DA9FF10C0D35500F26F56 /* sqMacUnixExternalPrims.m */; settings = {ASSET_TAGS = (); }; }; 94502E951BB609AC00EA8942 /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = 94502E941BB609AC00EA8942 /* sqUnixSpurMemory.c */; settings = {ASSET_TAGS = (); }; }; 94502E971BB71A9200EA8942 /* sqSqueakMainApplication+imageReadWrite.m in Sources */ = {isa = PBXBuildFile; fileRef = 94A0E8840DE5EF430071C8B9 /* sqSqueakMainApplication+imageReadWrite.m */; settings = {ASSET_TAGS = (); }; }; 94584FDB10F02378001401E7 /* sqMacExtendedClipboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 94584FD910F02378001401E7 /* sqMacExtendedClipboard.m */; }; @@ -149,7 +150,6 @@ 9487749710C64DD800E4AEC5 /* sqSqueakOSXApplication+clipboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 9428BB0510BB478600DAD287 /* sqSqueakOSXApplication+clipboard.m */; }; 9487749810C64DD800E4AEC5 /* sqSqueakOSXSoundCoreAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C4B82F10C06F8800CD4F90 /* sqSqueakOSXSoundCoreAudio.m */; }; 9487749A10C64DD800E4AEC5 /* sqSqueakOSXDropAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 946DA91410C0C71100F26F56 /* sqSqueakOSXDropAPI.m */; }; - 9487749B10C64DD800E4AEC5 /* sqMacUnixExternalPrims.m in Sources */ = {isa = PBXBuildFile; fileRef = 946DA9FF10C0D35500F26F56 /* sqMacUnixExternalPrims.m */; }; 9487749D10C64DD800E4AEC5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 947E61C210AA03C300D3B69E /* Cocoa.framework */; }; 9487749E10C64DD800E4AEC5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 9487749F10C64DD800E4AEC5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 945550000DF1BC6A00FB176B /* AudioToolbox.framework */; }; @@ -1757,6 +1757,7 @@ 9463C1C41AEE14DF009C5CE5 /* DropPlugin.c in Sources */, 94BB09781BB480AC0016BFDF /* HostWindowPlugin.c in Sources */, 94C3176A1AD49B020096E59D /* sqUnixJoystickTablet.c in Sources */, + 944154941BD595710062FCDE /* sqMacUnixExternalPrims.m in Sources */, 9487748C10C64DD800E4AEC5 /* sqSqueakOSXApplication+imageReadWrite.m in Sources */, 94502E971BB71A9200EA8942 /* sqSqueakMainApplication+imageReadWrite.m in Sources */, 94FA4CD61BB4D43900C1BE8F /* b3dDraw.c in Sources */, @@ -1780,7 +1781,6 @@ 94FA4CD51BB4D43900C1BE8F /* b3dAlloc.c in Sources */, 9463C1C51AEE150B009C5CE5 /* FFTPlugin.c in Sources */, 9487749A10C64DD800E4AEC5 /* sqSqueakOSXDropAPI.m in Sources */, - 9487749B10C64DD800E4AEC5 /* sqMacUnixExternalPrims.m in Sources */, 94D921561AC6320300A5970F /* SocketPlugin.c in Sources */, 94C315341AD4949B0096E59D /* AsynchFilePlugin.c in Sources */, 94C317541AD495CD0096E59D /* LocalePlugin.c in Sources */, Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakCogSpur32x86.xcscheme =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakCogSpur32x86.xcscheme 2015-10-16 17:59:15 UTC (rev 3475) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/xcuserdata/johnmci.xcuserdatad/xcschemes/SqueakCogSpur32x86.xcscheme 2015-10-19 23:15:48 UTC (rev 3476) @@ -64,6 +64,11 @@ </BuildableReference> </BuildableProductRunnable> <AdditionalOptions> + <AdditionalOption + key = "NSZombieEnabled" + value = "YES" + isEnabled = "YES"> + </AdditionalOption> </AdditionalOptions> </LaunchAction> <ProfileAction @@ -80,8 +85,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "948773F910C64DD800E4AEC5" BuildableName = "Squeak.app" - BlueprintName = "SqueakPureObjc64x64" - ReferencedContainer = "container:SqueakPureObjc.xcodeproj"> + BlueprintName = "SqueakCogSpur32x86" + ReferencedContainer = "container:SqueakCogSpur32x86.xcodeproj"> </BuildableReference> </BuildableProductRunnable> </ProfileAction> Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcworkspace/xcuserdata/johnmci.xcuserdatad/UserInterfaceState.xcuserstate =================================================================== (Binary files differ) Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m 2015-10-16 17:59:15 UTC (rev 3475) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryAPI.m 2015-10-19 23:15:48 UTC (rev 3476) @@ -86,13 +86,25 @@ /* outputs */ char *name, sqInt *nameLength, sqInt *creationDate, sqInt *modificationDate, sqInt *isDirectory, squeakFileOffsetType *sizeIfFile, sqInt *posixPermissions, sqInt *isSymlink); +#if !defined(PharoVM) +# define PharoVM 0 +#endif +#if PharoVM sqInt dir_Lookup(char *pathString, sqInt pathStringLength, sqInt index, -/* outputs: */ char *name, sqInt *nameLength, sqInt *creationDate, sqInt *modificationDate, - sqInt *isDirectory, squeakFileOffsetType *sizeIfFile) { - sqInt posixPermissions; - sqInt isSymlink; - sqInt status = dir_Lookup2(pathString, pathStringLength, index, name, nameLength, creationDate, modificationDate, isDirectory, sizeIfFile,&posixPermissions,&isSymlink); + /* outputs: */ + char *name, sqInt *nameLength, sqInt *creationDate, sqInt *modificationDate, + sqInt *isDirectory, squeakFileOffsetType *sizeIfFile, sqInt *posixPermissionsVar, sqInt *isSymlinkVar) +#else +sqInt dir_Lookup(char *pathString, sqInt pathStringLength, sqInt index, + /* outputs: */ + char *name, sqInt *nameLength, sqInt *creationDate, sqInt *modificationDate, + sqInt *isDirectory, squeakFileOffsetType *sizeIfFile) +#define posixPermissionsVar nil +#define isSymlinkVar nil +#endif +{ + sqInt status = dir_Lookup2(pathString, pathStringLength, index, name, nameLength, creationDate, modificationDate, isDirectory, sizeIfFile,posixPermissionsVar,isSymlinkVar); return status; } @@ -129,13 +141,19 @@ return status; } +#if PharoVM sqInt dir_EntryLookup(char *pathString, sqInt pathStringLength, char* nameString, sqInt nameStringLength, -/* outputs: */ char *name, sqInt *nameLength, sqInt *creationDate, sqInt *modificationDate, - sqInt *isDirectory, squeakFileOffsetType *sizeIfFile, sqInt *posixPermissions, sqInt *isSymlink) + /* outputs: */ + char *name, sqInt *nameLength, sqInt *creationDate, sqInt *modificationDate, + sqInt *isDirectory, squeakFileOffsetType *sizeIfFile, sqInt *posixPermissionsVar, sqInt *isSymlinkVar) +#else +sqInt dir_EntryLookup(char *pathString, sqInt pathStringLength, char* nameString, sqInt nameStringLength, + /* outputs: */ + char *name, sqInt *nameLength, sqInt *creationDate, sqInt *modificationDate, + sqInt *isDirectory, squeakFileOffsetType *sizeIfFile) +#endif { -#if !defined(PharoVM) -# define PharoVM 0 -#endif + /*Implementation notes if pathStringLength = 0 then we use the current working directory if pathStringLength > 0 then we resolve the pathString and alias */ @@ -151,8 +169,8 @@ modificationDate: modificationDate isDirectory: isDirectory sizeIfFile: sizeIfFile - posixPermissions: (PharoVM ? posixPermissions : 0) - isSymlink: (PharoVM ? isSymlink : 0)]; + posixPermissions: (PharoVM ? posixPermissionsVar : nil) + isSymlink: (PharoVM ? isSymlinkVar : nil)]; return status; } @@ -175,16 +193,20 @@ sqInt filenameLength, sqInt resolveAlias) { NSString * filePath = [[NSString alloc] initWithBytes: aFilenameString length: (NSUInteger) filenameLength encoding: NSUTF8StringEncoding]; if (!filePath) { + [filePath RELEASEOBJ]; return NULL; } + NSString *oldFilePath = filePath; if (resolveAlias) { filePath = [gDelegateApp.squeakApplication.fileDirectoryLogic resolvedAliasFiles: filePath]; + [oldFilePath RELEASEOBJ]; } else { NSString *owningDirectoryPath = [filePath stringByDeletingLastPathComponent]; NSString *newFilePath = [gDelegateApp.squeakApplication.fileDirectoryLogic resolvedAliasFiles: owningDirectoryPath]; filePath = [newFilePath stringByAppendingPathComponent: [filePath lastPathComponent]]; } + [oldFilePath RELEASEOBJ]; return filePath; } Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m 2015-10-16 17:59:15 UTC (rev 3475) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakFileDirectoryInterface.m 2015-10-19 23:15:48 UTC (rev 3476) @@ -133,8 +133,8 @@ if (nameStringLength <= 0 || pathStringLength <= 0) return BAD_PATH; - directoryPath = [[NSString alloc] initWithBytes: pathString length: (NSUInteger) pathStringLength encoding: NSUTF8StringEncoding]; - fileName = [[NSString alloc] initWithBytes: nameString length: (NSUInteger) nameStringLength encoding: NSUTF8StringEncoding]; + directoryPath = [[[NSString alloc] initWithBytes: pathString length: (NSUInteger) pathStringLength encoding: NSUTF8StringEncoding] AUTORELEASEOBJ]; + fileName = [[[NSString alloc] initWithBytes: nameString length: (NSUInteger) nameStringLength encoding: NSUTF8StringEncoding] AUTORELEASEOBJ]; if (![directoryPath hasSuffix: @"/"]) { directoryPath = [directoryPath stringByAppendingString: @"/"]; @@ -190,7 +190,7 @@ } if (pathStringLength > 0) { - directoryPath = [[NSString alloc] initWithBytes: pathString length: (NSUInteger) pathStringLength encoding: NSUTF8StringEncoding]; + directoryPath = [[[NSString alloc] initWithBytes: pathString length: (NSUInteger) pathStringLength encoding: NSUTF8StringEncoding] AUTORELEASEOBJ]; } if (directoryPath == NULL) { return BAD_PATH; Modified: branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m 2015-10-16 17:59:15 UTC (rev 3475) +++ branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m 2015-10-19 23:15:48 UTC (rev 3476) @@ -208,7 +208,7 @@ OSErr err = FSFindFolder(kSystemDomain, kFrameworksFolderType, false, &frameworksFolderRef); #pragma unused(err) NSURL *myURLRef = (NSURL *) CFBridgingRelease(CFURLCreateFromFSRef(kCFAllocatorDefault, &frameworksFolderRef)); - systemFolder = [myURLRef path]; + systemFolder = [[myURLRef path] RETAINOBJ]; } pluginNameLength = strlen(pluginName); Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+cursor.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+cursor.m 2015-10-16 17:59:15 UTC (rev 3475) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+cursor.m 2015-10-19 23:15:48 UTC (rev 3476) @@ -62,13 +62,13 @@ return; @autoreleasepool { - NSBitmapImageRep *bitmap= [[NSBitmapImageRep alloc] + NSBitmapImageRep *bitmap= [[[NSBitmapImageRep alloc] initWithBitmapDataPlanes: NULL pixelsWide: 16 pixelsHigh: 16 bitsPerSample: 1 samplesPerPixel: 2 hasAlpha: YES isPlanar: YES colorSpaceName: NSCalibratedBlackColorSpace bytesPerRow: 2 - bitsPerPixel: 0]; + bitsPerPixel: 0] AUTORELEASEOBJ]; unsigned char* planes[5]; [bitmap getBitmapDataPlanes:planes]; @@ -93,7 +93,7 @@ mask[i*2 + 1]= (word >> 16) & 0xFF; } - NSImage *image = [[NSImage alloc] init]; + NSImage *image = [[[NSImage alloc] init] AUTORELEASEOBJ]; [image addRepresentation: bitmap]; @@ -125,13 +125,13 @@ @autoreleasepool { - NSBitmapImageRep *bitmap= [[NSBitmapImageRep alloc] + NSBitmapImageRep *bitmap= [[[NSBitmapImageRep alloc] initWithBitmapDataPlanes: NULL pixelsWide: extentX pixelsHigh: extentY bitsPerSample: 8 samplesPerPixel: 4 hasAlpha: YES isPlanar: NO colorSpaceName: NSCalibratedRGBColorSpace bytesPerRow: extentX * 4 - bitsPerPixel: 0]; + bitsPerPixel: 0] AUTORELEASEOBJ]; unsigned int *planes[5]; [bitmap getBitmapDataPlanes: (unsigned char **) planes]; unsigned int *src= (unsigned int*) pointerForOop(cursorBitsIndex); @@ -144,7 +144,7 @@ *dst= (*src & 0xFF00FF00) | ((*src & 0x000000FF) << 16) | ((*src & 0x00FF0000) >> 16); // BGRA to RGBA #endif } - NSImage *image= [[NSImage alloc] init]; + NSImage *image= [[[NSImage alloc] init] AUTORELEASEOBJ]; [image addRepresentation: bitmap]; NSPoint hotSpot= { -offsetX, -offsetY }; self.squeakHasCursor = YES; Modified: branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch =================================================================== --- branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch 2015-10-16 17:59:15 UTC (rev 3475) +++ branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch 2015-10-19 23:15:48 UTC (rev 3476) @@ -5,3 +5,14 @@ #ifdef __OBJC__ #import <Cocoa/Cocoa.h> #endif + +#if __has_feature(objc_arc) +#define RELEASEOBJ +#define RETAINOBJ +#define AUTORELEASEOBJ +#else +#define RELEASEOBJ release +#define RETAINOBJ retain +#define AUTORELEASEOBJ autorelease + +#endif \ No newline at end of file

1 0

a question about building ARM support code in processors
by Robert Withers 20 Oct '15

20 Oct '15

I found some support code for the ARM plugin, in the processors directory. Following the instructions, I noticed there was no step to run make in the sim/common directory, though it has a Makefile and contains .c files. I carried on and when running make in sim/arm I received these errors multiple times: ../../include/libiberty.h:92:22: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘PARAMS’ wrapper.c:135:20: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘VPARAMS’ Any help resolving this is received with gratitude. Robert

3 8

a couple of challenges
by robert 19 Oct '15

19 Oct '15

Good day, On windows 7, I checked out the spur image and tried to run the simulator and the generator. For the simulator, I did a buildspurtrunkreaderimage.sh and got the spurreader.image and then running the simulator it generated an error in, as cogit was nil. CogStackPageSurrogate32>>lastAddress | v | ^(v := memory unsignedLongAt: address + 25) ~= 0 ifTrue: [cogit cCoerceSimple: v to: #'char *'] I then ran the generator and it blew up in DosFileDirectory>>createDirectory:, where the receiver was '' and the argument was: '\\C%3A' with a primitiveFailed. Just to let you know. Thanks, Cog's beautiful. -- robert

3 4

[commit][3471] Integrate Monty's support for the fsync primitive.
by commits＠squeakvm.org 19 Oct '15

19 Oct '15

Revision: 3471 Author: eliot Date: 2015-10-04 09:51:00 -0700 (Sun, 04 Oct 2015) Log Message: ----------- Integrate Monty's support for the fsync primitive. Modified Paths: -------------- trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c Modified: trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c =================================================================== --- trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2015-10-04 16:50:28 UTC (rev 3470) +++ trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2015-10-04 16:51:00 UTC (rev 3471) @@ -297,6 +297,14 @@ return 1; } +sqInt sqFileSync(SQFile *f) { + /* + * sqFileFlush uses FlushFileBuffers which is equivalent to fsync on windows + * as long as WriteFile is used directly and no other buffering is done. + */ + return sqFileFlush(SQFile *f); +} + sqInt sqFileTruncate(SQFile *f, squeakFileOffsetType offset) { win32FileOffset ofs; ofs.offset = offset;

2 1

VM Maker: VMMaker.oscog-eem.1493.mcz
by commits＠source.squeak.org 19 Oct '15

19 Oct '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1493.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1493 Author: eem Time: 19 October 2015, 10:15:07.794 am UUID: 106ebfee-467a-4cc7-a1cd-8accfc7926b0 Ancestors: VMMaker.oscog-eem.1492 x64 Cogit: Refactor CFrame/StackPointer simulation machinery so they can be accessed via VarBaseReg. Fix stack alignment code for processors with register arbguments (I hope). Implement x64 prefetch. =============== Diff against VMMaker.oscog-eem.1492 =============== Item was changed: ----- Method: CogARMCompiler>>nameForRegister: (in category 'printing') ----- nameForRegister: reg "<Integer>" - <doNotGenerate> + reg < 0 ifTrue: + [^super nameForRegister: reg]. + ^#(LR SP PC CArg0Reg CArg0Reg CArg1Reg CArg2Reg CArg3Reg) + detect: [:sym| (thisContext method methodClass classPool at: sym) = reg] - ^#(LR SP PC CArg0Reg CArg0Reg CArg1Reg CArg2Reg CArg3Reg) detect: [:sym| (thisContext method methodClass classPool at: sym) = reg] ifNone: [super nameForRegister: reg]! Item was added: + ----- Method: CogARMCompiler>>numIntRegArgs (in category 'accessing') ----- + numIntRegArgs + ^4! Item was changed: ----- Method: CogAbstractInstruction>>genAlignCStackSavingRegisters:numArgs:wordAlignment: (in category 'abi') ----- genAlignCStackSavingRegisters: saveRegs numArgs: numArgs wordAlignment: alignment | wordsPushedModAlignment delta | + self numIntRegArgs >= (saveRegs + ifTrue: [self numberOfSaveableRegisters + numArgs] + ifFalse: [numArgs]) ifTrue: + [^0]. wordsPushedModAlignment := ((saveRegs ifTrue: [self numberOfSaveableRegisters] ifFalse: [0]) + numArgs) \\ alignment. wordsPushedModAlignment ~= 0 ifTrue: [delta := alignment - wordsPushedModAlignment. cogit SubCq: delta * 4 R: SPReg]. ^0! Item was added: + ----- Method: CogAbstractInstruction>>numIntRegArgs (in category 'accessing') ----- + numIntRegArgs + ^self subclassResponsibility! Item was changed: ----- Method: CogAbstractInstruction>>wantsNearAddressFor: (in category 'simulation') ----- wantsNearAddressFor: anObject + "A hack hook to allow ARM to override the simulated address for the short-cut trampolines, + and to allow x64 to address CStackPointer and CFramePointer relative to VarBaseReg." - "A hack hook to allow ARM to override the simulated address for the short-cut trampolines" ^false! Item was added: + ----- Method: CogIA32Compiler>>numIntRegArgs (in category 'accessing') ----- + numIntRegArgs + ^0! Item was removed: - ----- Method: CogVMSimulator>>CFramePointer (in category 'debug support') ----- - CFramePointer - ^self longAt: self inMemoryCFramePointerAddress! Item was removed: - ----- Method: CogVMSimulator>>CStackPointer (in category 'debug support') ----- - CStackPointer - ^self longAt: self inMemoryCStackPointerAddress! Item was changed: ----- Method: CogVMSimulator>>utilitiesMenu: (in category 'UI') ----- utilitiesMenu: aMenuMorph aMenuMorph add: 'toggle transcript' action: #toggleTranscript; add: 'clone VM' action: #cloneSimulationWindow; addLine; add: 'print ext head frame' action: #printExternalHeadFrame; add: 'print int head frame' action: #printHeadFrame; add: 'print mc/cog frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp]; add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer]; add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP]; add: 'short print mc/cog frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp]; add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer]; add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP]; add: 'long print mc/cog frame & callers' action: [self printFrameAndCallers: cogit processor fp SP: cogit processor sp]; add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]]; add: 'print call stack' action: #printCallStack; add: 'print stack call stack' action: #printStackCallStack; add: 'print stack call stack of...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printStackCallStackOf: fp]]; add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]]; add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]]; add: 'print all stacks' action: #printAllStacks; add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP. self writeBackHeadFramePointers]; add: 'write back mc ptrs' action: [stackPointer := cogit processor sp. framePointer := cogit processor fp. instructionPointer := cogit processor eip. self writeBackHeadFramePointers]; addLine; + add: 'print rump C stack' action: [objectMemory printMemoryFrom: cogit processor sp to: cogit getCStackPointer]; - add: 'print rump C stack' action: [objectMemory printMemoryFrom: cogit processor sp to: self CStackPointer]; add: 'print registers' action: [cogit processor printRegistersOn: transcript]; add: 'print register map' action: [cogit printRegisterMapOn: transcript]; add: 'disassemble method/trampoline...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit disassembleCodeAt: pc]]; add: 'disassemble method/trampoline at pc' action: [cogit disassembleCodeAt: ((cogit methodZone methodFor: cogit processor pc) = 0 ifTrue: [instructionPointer] ifFalse: [cogit processor pc])]; add: 'disassemble ext head frame method' action: [cogit disassembleMethod: (self frameMethod: framePointer)]; add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]]; add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]]; add: 'print context...' action: [(self promptHex: 'print context') ifNotNil: [:oop| self printContext: oop]]; addLine; add: 'inspect object memory' target: objectMemory action: #inspect; add: 'run leak checker' action: [Cursor execute showWhile: [self runLeakChecker]]; add: 'inspect cointerpreter' action: #inspect; add: 'inspect cogit' target: cogit action: #inspect; add: 'inspect method zone' target: cogit methodZone action: #inspect. self isThreadedVM ifTrue: [aMenuMorph add: 'inspect thread manager' target: self threadManager action: #inspect]. aMenuMorph addLine; add: 'print cog methods' target: cogMethodZone action: #printCogMethods; add: 'print cog methods with prim...' action: [(self promptNum: 'prim index') ifNotNil: [:pix| cogMethodZone printCogMethodsWithPrimitive: pix]]; add: 'print cog methods with selector...' action: [|s| s := UIManager default request: 'selector'. s notEmpty ifTrue: [s = 'nil' ifTrue: [s := nil]. cogMethodZone methodsDo: [:m| (s ifNil: [m selector = objectMemory nilObject] ifNotNil: [(objectMemory numBytesOf: m selector) = s size and: [(self str: s n: (m selector + objectMemory baseHeaderSize) cmp: (objectMemory numBytesOf: m selector)) = 0]]) ifTrue: [cogit printCogMethod: m]]]]; add: 'print cog method for...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit printCogMethodFor: pc]]; add: 'print cog method header for...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit printCogMethodHeaderFor: pc]]; add: 'print trampoline table' target: cogit action: #printTrampolineTable; add: 'print prim trace log' action: #dumpPrimTraceLog; add: 'report recent instructions' target: cogit action: #reportLastNInstructions; add: 'set break pc (', (cogit breakPC isInteger ifTrue: [cogit breakPC hex] ifFalse: [cogit breakPC printString]), ')...' action: [(self promptHex: 'break pc') ifNotNil: [:bpc| cogit breakPC: bpc]]; add: (cogit singleStep ifTrue: ['no single step'] ifFalse: ['single step']) action: [cogit singleStep: cogit singleStep not]; add: (cogit printRegisters ifTrue: ['no print registers each instruction'] ifFalse: ['print registers each instruction']) action: [cogit printRegisters: cogit printRegisters not]; add: (cogit printInstructions ifTrue: ['no print instructions each instruction'] ifFalse: ['print instructions each instruction']) action: [cogit printInstructions: cogit printInstructions not]; addLine; add: 'click step' action: [cogit setClickStepBreakBlock]; add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'. s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]]; add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakSelector: s]]; add: 'set break block...' action: [|s| s := UIManager default request: 'break block' initialAnswer: '[:theCogit| false]'. s notEmpty ifTrue: [self setBreakBlockFromString: s]]; add: 'set cogit break method...' action: [(self promptHex: 'cogit breakMethod') ifNotNil: [:bm| cogit setBreakMethod: bm]]; add: (printBytecodeAtEachStep ifTrue: ['no print bytecode each bytecode'] ifFalse: ['print bytecode each bytecode']) action: [self ensureDebugAtEachStepBlock. printBytecodeAtEachStep := printBytecodeAtEachStep not]; add: (printFrameAtEachStep ifTrue: ['no print frame each bytecode'] ifFalse: ['print frame each bytecode']) action: [self ensureDebugAtEachStepBlock. printFrameAtEachStep := printFrameAtEachStep not]. ^aMenuMorph! Item was changed: ----- Method: CogX64Compiler>>computeMaximumSize (in category 'generate machine code') ----- computeMaximumSize "Compute the maximum size for each opcode. This allows jump offsets to be determined, provided that all backward branches are long branches." "N.B. The ^N forms are to get around the bytecode compiler's long branch limits which are exceeded when each case jumps around the otherwise." opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^0]. [AlignmentNops] -> [^(operands at: 0) - 1]. [Fill16] -> [^2]. [Fill32] -> [^4]. [FillFromWord] -> [^4]. [Nop] -> [^1]. "Specific Control/Data Movement" [CDQ] -> [^2]. [IDIVR] -> [^3]. [IMULRR] -> [^4]. [CPUID] -> [^2]. [CMPXCHGAwR] -> [^8]. [CMPXCHGMwrR] -> [^9]. [LFENCE] -> [^3]. [MFENCE] -> [^3]. [SFENCE] -> [^3]. [LOCK] -> [^1]. "[XCHGAwR] -> [^6]. [XCHGMwrR] -> [^7]." [XCHGRR] -> [^((self concreteRegister: (operands at: 0)) = RAX or: [(self concreteRegister: (operands at: 1)) = RAX]) ifTrue: [2] ifFalse: [3]]. "Control" [CallFull] -> [^12]. [Call] -> [^5]. [JumpR] -> [^2]. [JumpFull] -> [self resolveJumpTarget. ^12]. [JumpLong] -> [self resolveJumpTarget. ^5]. [Jump] -> [self resolveJumpTarget. ^5]. [JumpZero] -> [self resolveJumpTarget. ^6]. [JumpNonZero] -> [self resolveJumpTarget. ^6]. [JumpNegative] -> [self resolveJumpTarget. ^6]. [JumpNonNegative] -> [self resolveJumpTarget. ^6]. [JumpOverflow] -> [self resolveJumpTarget. ^6]. [JumpNoOverflow] -> [self resolveJumpTarget. ^6]. [JumpCarry] -> [self resolveJumpTarget. ^6]. [JumpNoCarry] -> [self resolveJumpTarget. ^6]. [JumpLess] -> [self resolveJumpTarget. ^6]. [JumpGreaterOrEqual] -> [self resolveJumpTarget. ^6]. [JumpGreater] -> [self resolveJumpTarget. ^6]. [JumpLessOrEqual] -> [self resolveJumpTarget. ^6]. [JumpBelow] -> [self resolveJumpTarget. ^6]. [JumpAboveOrEqual] -> [self resolveJumpTarget. ^6]. [JumpAbove] -> [self resolveJumpTarget. ^6]. [JumpBelowOrEqual] -> [self resolveJumpTarget. ^6]. [JumpLongZero] -> [self resolveJumpTarget. ^6]. [JumpLongNonZero] -> [self resolveJumpTarget. ^6]. [JumpFPEqual] -> [self resolveJumpTarget. ^6]. [JumpFPNotEqual] -> [self resolveJumpTarget. ^6]. [JumpFPLess] -> [self resolveJumpTarget. ^6]. [JumpFPGreaterOrEqual] -> [self resolveJumpTarget. ^6]. [JumpFPGreater] -> [self resolveJumpTarget. ^6]. [JumpFPLessOrEqual] -> [self resolveJumpTarget. ^6]. [JumpFPOrdered] -> [self resolveJumpTarget. ^6]. [JumpFPUnordered] -> [self resolveJumpTarget. ^6]. [RetN] -> [^(operands at: 0) = 0 ifTrue: [1] ifFalse: [3]]. [Stop] -> [^1]. "Arithmetic" [AddCqR] -> [^self computeSizeOfArithCqR]. [AndCqR] -> [^self computeSizeOfArithCqR]. [CmpCqR] -> [^self computeSizeOfArithCqR]. [OrCqR] -> [^self computeSizeOfArithCqR]. [SubCqR] -> [^self computeSizeOfArithCqR]. [TstCqR] -> [^self computeSizeOfArithCqR]. [AddCwR] -> [^self computeSizeOfArithCwR]. [AndCwR] -> [^self computeSizeOfArithCwR]. [CmpCwR] -> [^self computeSizeOfArithCwR]. [OrCwR] -> [^self computeSizeOfArithCwR]. [SubCwR] -> [^self computeSizeOfArithCwR]. [XorCwR] -> [^self computeSizeOfArithCwR]. [AddRR] -> [^3]. [AndRR] -> [^3]. [CmpRR] -> [^3]. [OrRR] -> [^3]. [XorRR] -> [^3]. [SubRR] -> [^3]. [NegateR] -> [^3]. "[LoadEffectiveAddressMwrR] -> [^((self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [6]) + ((self concreteRegister: (operands at: 1)) = ESP ifTrue: [1] ifFalse: [0])]." [LogicalShiftLeftCqR] -> [^(operands at: 0) = 1 ifTrue: [3] ifFalse: [4]]. [LogicalShiftRightCqR] -> [^(operands at: 0) = 1 ifTrue: [3] ifFalse: [4]]. [ArithmeticShiftRightCqR] -> [^(operands at: 0) = 1 ifTrue: [3] ifFalse: [4]]. [LogicalShiftLeftRR] -> [^self computeShiftRRSize]. [LogicalShiftRightRR] -> [^self computeShiftRRSize]. [ArithmeticShiftRightRR] -> [^self computeShiftRRSize]. [AddRdRd] -> [^4]. [CmpRdRd] -> [^4]. [SubRdRd] -> [^4]. [MulRdRd] -> [^4]. [DivRdRd] -> [^4]. [SqrtRd] -> [^4]. "Data Movement" [MoveCqR] -> [^(operands at: 0) = 0 ifTrue: [3] ifFalse: [(self is32BitSignedImmediate: (operands at: 0)) ifTrue: [7] ifFalse: [self moveCwRByteSize]]]. [MoveCwR] -> [^self moveCwRByteSize]. [MoveC32R] -> [^7]. "N.B. Always inlined." [MoveRR] -> [^3]. [MoveRdRd] -> [^4]. [MoveAwR] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) ifTrue: [7] ifFalse: [(self concreteRegister: (operands at: 1)) = RAX ifTrue: [10] ifFalse: [14]]]. [MoveRAw] -> [^(self isAddressRelativeToVarBase: (operands at: 1)) ifTrue: [7] ifFalse: [(self concreteRegister: (operands at: 0)) = RAX ifTrue: [10] ifFalse: [14]]]. [MoveRMwr] -> [^((self isQuick: (operands at: 1)) ifTrue: [((operands at: 1) = 0 and: [((self concreteRegister: (operands at: 2)) bitAnd: 7) ~= RBP]) ifTrue: [3] ifFalse: [4]] ifFalse: [7]) + (((self concreteRegister: (operands at: 2)) bitAnd: 7) = RSP ifTrue: [1] ifFalse: [0])]. "[MoveRdM64r] -> [^((self isQuick: (operands at: 1)) ifTrue: [5] ifFalse: [8]) + ((self concreteRegister: (operands at: 2)) = ESP ifTrue: [1] ifFalse: [0])]." [MoveMbrR] -> [^((self isQuick: (operands at: 0)) ifTrue: [((operands at: 0) = 0 and: [((self concreteRegister: (operands at: 1)) bitAnd: 7) ~= RBP]) ifTrue: [4] ifFalse: [5]] ifFalse: [8]) + (((self concreteRegister: (operands at: 1)) bitAnd: 7) = RSP ifTrue: [1] ifFalse: [0])]. [MoveRMbr] -> [^((self isQuick: (operands at: 1)) ifTrue: [((operands at: 1) = 0 and: [((self concreteRegister: (operands at: 0)) bitAnd: 7) ~= RBP]) ifTrue: [3] ifFalse: [4]] ifFalse: [7]) + (((self concreteRegister: (operands at: 2)) bitAnd: 7) = RSP ifTrue: [1] ifFalse: [0])]. [MoveM16rR] -> [^((self isQuick: (operands at: 0)) ifTrue: [((operands at: 0) = 0 and: [((self concreteRegister: (operands at: 1)) bitAnd: 7) ~= RBP]) ifTrue: [4] ifFalse: [5]] ifFalse: [8]) + (((self concreteRegister: (operands at: 1)) bitAnd: 7) = RSP ifTrue: [1] ifFalse: [0])]. "[MoveM64rRd] -> [^((self isQuick: (operands at: 0)) ifTrue: [5] ifFalse: [8]) + ((self concreteRegister: (operands at: 1)) = ESP ifTrue: [1] ifFalse: [0])]." [MoveMwrR] -> [^((self isQuick: (operands at: 0)) ifTrue: [((operands at: 0) = 0 and: [((self concreteRegister: (operands at: 1)) bitAnd: 7) ~= RBP]) ifTrue: [3] ifFalse: [4]] ifFalse: [7]) + (((self concreteRegister: (operands at: 1)) bitAnd: 7) = RSP ifTrue: [1] ifFalse: [0])]. [MoveXbrRR] -> [self assert: (self concreteRegister: (operands at: 0)) ~= RSP. ^((self concreteRegister: (operands at: 1)) bitAnd: 7) = RBP ifTrue: [6] ifFalse: [5]]. [MoveRXbrR] -> [self assert: (self concreteRegister: (operands at: 1)) ~= RSP. ^(((self concreteRegister: (operands at: 0)) < 8 and: [(self concreteRegister: (operands at: 1)) < 8 and: [(self concreteRegister: (operands at: 2)) < 8]]) ifTrue: [3] ifFalse: [4]) + (((self concreteRegister: (operands at: 2)) bitAnd: 7) = RBP ifTrue: [1] ifFalse: [0])]. [MoveXwrRR] -> [self assert: (self concreteRegister: (operands at: 0)) ~= RSP. ^((self concreteRegister: (operands at: 1)) = RBP or: [(self concreteRegister: (operands at: 1)) = R13]) ifTrue: [5] ifFalse: [4]]. [MoveRXwrR] -> [self assert: (self concreteRegister: (operands at: 1)) ~= RSP. ^((self concreteRegister: (operands at: 2)) = RBP or: [(self concreteRegister: (operands at: 2)) = R13]) ifTrue: [5] ifFalse: [4]]. [PopR] -> [^(self concreteRegister: (operands at: 0)) < 8 ifTrue: [1] ifFalse: [2]]. [PushR] -> [^(self concreteRegister: (operands at: 0)) < 8 ifTrue: [1] ifFalse: [2]]. [PushCq] -> [^(self isQuick: (operands at: 0)) ifTrue: [2] ifFalse: [5]]. [PushCw] -> [^self pushCwByteSize]. + [PrefetchAw] -> [^(self isAddressRelativeToVarBase: (operands at: 0)) ifTrue: [7] ifFalse: [0]]. - [PrefetchAw] -> [^self hasSSEInstructions ifTrue: [12] ifFalse: [0]]. "Conversion" "[ConvertRRd] -> [^4]" }. ^0 "to keep C compiler quiet"! Item was added: + ----- Method: CogX64Compiler>>concretizePrefetchAw (in category 'generate machine code') ----- + concretizePrefetchAw + "We support only prefetches for addresses that are variables relative to VarBase" + | operand offset | + operand := operands at: 0. + (self isAddressRelativeToVarBase: operand) ifFalse: + [^machineCodeSize := 0]. + offset := operand - cogit varBaseAddress. + machineCode + at: 0 put: 16r0f; + at: 1 put: 16r18; + at: 2 put: 16r93; + at: 3 put: (offset bitAnd: 16rFF); + at: 4 put: (offset >> 16 bitAnd: 16rFF); + at: 5 put: (offset >> 8 bitAnd: 16rFF); + at: 6 put: offset >> 24. + ^machineCodeSize := 7! Item was added: + ----- Method: CogX64Compiler>>nameForRegister: (in category 'printing') ----- + nameForRegister: reg "<Integer>" + <doNotGenerate> + (reg between: 0 and: 15) ifTrue: + [^#(RAX RCX RDX RBX RSP RBP RSI RDI R8 R9 R10 R11 R12 R13 R14 R15) at: reg + 1]. + ^super nameForRegister: reg! Item was added: + ----- Method: CogX64Compiler>>numIntRegArgs (in category 'accessing') ----- + numIntRegArgs + ^6! Item was added: + ----- Method: CogX64Compiler>>wantsNearAddressFor: (in category 'simulation') ----- + wantsNearAddressFor: anObject + "A hack hook to allow x64 to address CStackPointer and CFramePointer relative to VarBaseReg." + <doNotGenerate> + ^anObject isSymbol and: ['C*Pointer' match: anObject]! Item was changed: CogClass subclass: #Cogit + instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager callerSavedRegMask postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceEnclosingObjectTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner extA extB tempOop numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines cogMethodSurrogateClass cogBlockMethodSurrogateClass nsSendCacheSurrogateClass CStackPointer CFramePointer' - instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager callerSavedRegMask postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceEnclosingObjectTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines nsSendCacheSurrogateClass tempOop' classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AltNumSpecialSelectors AnnotationConstantNames AnnotationShift AnnotationsWithBytecodePCs BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration FirstAnnotation FirstSpecialSelector HasBytecodePC IsAbsPCReference IsAnnotationExtension IsDirectedSuperSend IsDisplacementX2N IsNSDynamicSuperSend IsNSImplicitReceiverSend IsNSSelfSend IsNSSendCall IsObjectReference IsRelativeCall IsSendCall IsSuperSend MapEnd MaxCompiledPrimitiveIndex MaxStackAllocSize MaxX2NDisplacement NSCClassTagIndex NSCEnclosingObjectIndex NSCNumArgsIndex NSCSelectorIndex NSCTargetIndex NSSendIsPCAnnotated NumObjRefsInRuntime NumOopsPerNSC NumSpecialSelectors NumTrampolines ProcessorClass' poolDictionaries: 'CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMBytecodeConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 4/6/2015 15:56' prior: 0! I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) I have concrete subclasses that implement different levels of optimization: SimpleStackBasedCogit is the simplest code generator. StackToRegisterMappingCogit is the current production code generator It defers pushing operands to the stack until necessary and implements a register-based calling convention for low-arity sends. StackToRegisterMappingCogit is an experimental code generator with support for counting conditional branches, intended to support adaptive optimization. coInterpreter <CoInterpreterSimulator> the VM's interpreter with which I cooperate methodZoneManager <CogMethodZoneManager> the manager of the machine code zone objectRepresentation <CogObjectRepresentation> the object used to generate object accesses processor <BochsIA32Alien|?> the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk simulatedTrampolines <Dictionary of Integer -> MessageSend> the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time. simulatedVariableGetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time. simulatedVariableSetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time. printRegisters printInstructions clickConfirm <Boolean> flags controlling debug printing and code simulation breakPC <Integer> machine code pc breakpoint cFramePointer cStackPointer <Integer> the variables representing the C stack & frame pointers, which must change on FFI callback and return selectorOop <sqInt> the oop of the methodObj being compiled methodObj <sqInt> the bytecode method being compiled initialPC endPC <Integer> the start and end pcs of the methodObj being compiled methodOrBlockNumArgs <Integer> argument count of current method or block being compiled needsFrame <Boolean> whether methodObj or block needs a frame to execute primitiveIndex <Integer> primitive index of current method being compiled methodLabel <CogAbstractOpcode> label for the method header blockEntryLabel <CogAbstractOpcode> label for the start of the block dispatch code stackOverflowCall <CogAbstractOpcode> label for the call of ceStackOverflow in the method prolog sendMissCall <CogAbstractOpcode> label for the call of ceSICMiss in the method prolog entryOffset <Integer> offset of method entry code from start (header) of method entry <CogAbstractOpcode> label for the first instruction of the method entry code noCheckEntryOffset <Integer> offset of the start of a method proper (after the method entry code) from start (header) of method noCheckEntry <CogAbstractOpcode> label for the first instruction of start of a method proper fixups <Array of <AbstractOpcode Label | nil>> the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode abstractOpcodes <Array of <AbstractOpcode>> the code generated when compiling methodObj byte0 byte1 byte2 byte3 <Integer> individual bytes of current bytecode being compiled in methodObj bytecodePointer <Integer> bytecode pc (same as Smalltalk) of the current bytecode being compiled opcodeIndex <Integer> the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist) numAbstractOpcodes <Integer> the number of elements in abstractOpcocdes blockStarts <Array of <BlockStart>> the starts of blocks in the current method blockCount the index into blockStarts as they are being noted, and hence eventually the total number of blocks in the current method labelCounter <Integer> a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about ceStackOverflowTrampoline <Integer> ceSend0ArgsTrampoline <Integer> ceSend1ArgsTrampoline <Integer> ceSend2ArgsTrampoline <Integer> ceSendNArgsTrampoline <Integer> ceSendSuper0ArgsTrampoline <Integer> ceSendSuper1ArgsTrampoline <Integer> ceSendSuper2ArgsTrampoline <Integer> ceSendSuperNArgsTrampoline <Integer> ceSICMissTrampoline <Integer> ceCPICMissTrampoline <Integer> ceStoreCheckTrampoline <Integer> ceReturnToInterpreterTrampoline <Integer> ceBaseFrameReturnTrampoline <Integer> ceSendMustBeBooleanTrampoline <Integer> ceClosureCopyTrampoline <Integer> the various trampolines (system-call-like jumps from machine code to the run-time). See Cogit>>generateTrampolines for the mapping from trampoline to run-time routine and then read the run-time routine for a funcitonal description. ceEnterCogCodePopReceiverReg <Integer> the enilopmart (jump from run-time to machine-code) methodZoneBase <Integer> ! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! Item was changed: ----- Method: Cogit>>cFramePointerAddress (in category 'trampoline support') ----- cFramePointerAddress <cmacro: '() ((unsigned long)&CFramePointer)'> + ^(backEnd wantsNearAddressFor: #CFramePointer) + ifTrue: [self simulatedReadWriteVariableAddress: #getCFramePointer in: self] + ifFalse: [coInterpreter inMemoryCFramePointerAddress]! - ^coInterpreter inMemoryCFramePointerAddress! Item was changed: ----- Method: Cogit>>cStackPointerAddress (in category 'trampoline support') ----- cStackPointerAddress <cmacro: '() ((unsigned long)&CStackPointer)'> + ^(backEnd wantsNearAddressFor: #CStackPointer) + ifTrue: [self simulatedReadWriteVariableAddress: #getCStackPointer in: self] + ifFalse: [coInterpreter inMemoryCStackPointerAddress]! - ^coInterpreter inMemoryCStackPointerAddress! Item was changed: ----- Method: Cogit>>getCFramePointer (in category 'accessing') ----- getCFramePointer <api> <cmacro: '() CFramePointer'> "and in the simulator we use..." + ^(backEnd wantsNearAddressFor: #CFramePointer) + ifTrue: [CFramePointer] + ifFalse: [objectMemory longAt: coInterpreter inMemoryCFramePointerAddress]! - ^objectMemory longAt: coInterpreter inMemoryCFramePointerAddress! Item was changed: ----- Method: Cogit>>getCStackPointer (in category 'accessing') ----- getCStackPointer <api> <cmacro: '() CStackPointer'> "and in the simulator we use..." + ^(backEnd wantsNearAddressFor: #CStackPointer) + ifTrue: [CStackPointer] + ifFalse: [objectMemory longAt: coInterpreter inMemoryCStackPointerAddress]! - ^objectMemory longAt: coInterpreter inMemoryCStackPointerAddress! Item was changed: ----- Method: Cogit>>initializeProcessor (in category 'initialization') ----- initializeProcessor "Initialize the simulation processor, arranging that its initial stack is somewhere on the rump C stack." <doNotGenerate> guardPageSize := self class guardPageSize. lastNInstructions := OrderedCollection new. processor initializeStackFor: self. self initializeProcessorStack: coInterpreter rumpCStackAddress. + self setCFramePointer: processor fp. + self setCStackPointer: processor sp. - objectMemory - longAt: self cFramePointerAddress put: processor fp; - longAt: self cStackPointerAddress put: processor sp. threadManager ifNotNil: [processor := MultiProcessor for: processor coInterpreter: coInterpreter]! Item was changed: ----- Method: Cogit>>setCFramePointer: (in category 'accessing') ----- setCFramePointer: aFramePointer <api> <cmacro: '(theFP) (CFramePointer = (void *)(theFP))'> "and in the simulator we use..." + ^(backEnd wantsNearAddressFor: #CFramePointer) + ifTrue: [CFramePointer] + ifFalse: [objectMemory + longAt: coInterpreter inMemoryCFramePointerAddress + put: aFramePointer]! - ^objectMemory - longAt: coInterpreter inMemoryCFramePointerAddress - put: aFramePointer! Item was changed: ----- Method: Cogit>>setCStackPointer: (in category 'accessing') ----- setCStackPointer: aStackPointer <api> <cmacro: '(theSP) (CStackPointer = (void *)(theSP))'> "and in the simulator we use..." + ^(backEnd wantsNearAddressFor: #CStackPointer) + ifTrue: [CStackPointer] + ifFalse: [objectMemory + longAt: coInterpreter inMemoryCStackPointerAddress + put: aStackPointer]! - ^objectMemory - longAt: coInterpreter inMemoryCStackPointerAddress - put: aStackPointer! Item was changed: ----- Method: Cogit>>simulatedReadWriteVariableAddress:in: (in category 'initialization') ----- simulatedReadWriteVariableAddress: getter in: receiver "Answer a simulated variable. This is a variable whose value can be read and written by generated machine code." <doNotGenerate> | address | address := self simulatedVariableAddress: getter in: receiver. simulatedVariableSetters at: address ifAbsentPut: [| setter | + setter := (((getter beginsWith: 'get') + ifTrue: ['s', getter allButFirst] + ifFalse: [getter]), ':') asSymbol. - setter := (getter, ':') asSymbol. [:value| receiver perform: setter with: value]]. ^address!

1 0

VM Maker: Cog-eem.286.mcz
by commits＠source.squeak.org 18 Oct '15

18 Oct '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.286.mcz ==================== Summary ==================== Name: Cog-eem.286 Author: eem Time: 18 October 2015, 10:03:55.845 am UUID: e1f00ad9-6624-4d94-8132-83b19c1e1710 Ancestors: Cog-eem.285 More X64 simulation support. =============== Diff against Cog-eem.285 =============== Item was added: + ----- Method: BochsX64Alien>>endianness (in category 'accessing-abstract') ----- + endianness + ^#little! Item was added: + ----- Method: BochsX64Alien>>pushWord:in: (in category 'execution') ----- + pushWord: aValue in: aMemory + | sp | + sp := (self rsp: self rsp - 8). + aMemory long64At: sp + 1 put: aValue! Item was added: + ----- Method: BochsX64Alien>>simulateLeafCallOf:nextpc:memory: (in category 'execution') ----- + simulateLeafCallOf: address nextpc: nextpc memory: aMemory + self pushWord: nextpc in: aMemory. + self rip: address! Item was added: + ----- Method: BochsX64Alien>>smashRegisterAccessors (in category 'accessing-abstract') ----- + smashRegisterAccessors + ^#(rax: rbx: rcx: rdx: rsi: rdi: r8: r9: r10: r11: r12: r13: r14: r15:)!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2015