Vm-dev November 2013

vm-dev@lists.squeakfoundation.org

30 participants
103 discussions

Re: [Vm-dev] Frequent SegFaults in PharoVM with Pharo 3.0
by Max Leske 25 Nov '13

25 Nov '13

On 07.11.2013, at 00:27, vm-dev-request(a)lists.squeakfoundation.org wrote: > Date: Wed, 6 Nov 2013 19:23:47 -0200 > From: Mariano Martinez Peck <marianopeck(a)gmail.com> > Subject: Re: [Vm-dev] Frequent SegFaults in PharoVM with Pharo 3.0 > To: Squeak Virtual Machine Development Discussion > <vm-dev(a)lists.squeakfoundation.org> > Message-ID: > <CAA+-=mWDtHGQWSHx-m4u37Kj0UAMx=UG=qUCz+wMvgDT8BaQZQ(a)mail.gmail.com> > Content-Type: text/plain; charset="windows-1252" > > Max, did you try with Eliot VMs besides the pharo ones? No, I haven’t. I can try (though only on my machine), but if I can’t reproduce the SegFault that doesn’t mean much unfortunately. It took me 10 to 20 tries with the PharoVM too… I’ll try anyway and let you know what I find. Max > > Thanks > > > On Wed, Nov 6, 2013 at 6:04 PM, Max Leske <maxleske(a)gmail.com> wrote: > >> >> Hi >> >> We’ve been encountering frequent SegFaults when running the Fuel tests on >> the Pharo CI (https://ci.inria.fr/pharo-contribution/job/Fuel/). Since >> today I’ve also been able to reproduce the SegFaults on my MacBook Pro (OS >> X 10.9) too. We have not been able to determine the cause of the SegFault >> but we can produce SegFaults often, although not reliable (more reliable on >> the CI). >> >> The CI uses the stable VM: >> http://files.pharo.org/vm/pharo/linux/stable.zip >> I use a newer version from October on my machine: >> http://files.pharo.org/vm/pharo/mac/273.zip >> >> I’ve attached all the dumps of the crashes I was able to produce on my >> machine, together with Apple’s crash logs. >> >> I’ve been able to deduce the following: >> - garbage collection seems to be a trigger for the SegFault. When one of >> the methods FLMethodContextSerialization>>testFuelShouldIgnoreFuel and >> FLMethodContextSerialization>>testMethodContextWithNilPc contain the line >> “3 timesRepeat: [Smalltalk garbageCollect]” the SegFault appears nearly >> always (on CI). When I remove the line the builds run through. >> - Not all methods with the garbage collect line trigger a SegFault (I >> could only identify those two) >> - the garbage collect line itself suffices as a trigger in the mentioned >> methods. >> - The number of tests (amount of used memory?) seems to influence the >> appearence of the SegFault (e.g. loading "DevelopmentGroup" seems to >> trigger it more often than loading “Benchmarks”) >> - the SegFault always appears after the tests with the garbage collect >> line have been run, never before >> - the VM can’t write the crash.dmp every time >> >> Since the SegFaults are so random I cannot give you an image to reproduce >> the problem. I’ve had the best results using a fresh 3.0 image ( >> http://files.pharo.org/image/30/30549.zip) and then evaluating the >> following in a workspace: >> >> Gofer it >> smalltalkhubUser: 'Pharo' project: 'Fuel'; >> package: 'ConfigurationOfFuel'; >> load. >> >> ((Smalltalk at: #ConfigurationOfFuel) project version: #bleedingEdge) >> load: 'DevelopmentGroup'. >> >> HDTestReport >> runClasses: (TestCase allSubclasses select: [ :class | class name >> beginsWith: 'FL']) >> named: ‘foo' >> >> If it doesn’t work, try using the TestRunner manually. Select the default >> Fuel tests (alphabetically at F) and the additional Fuel tests (at the >> bottom of the list) and run them. >> >> If anybody has any clue about what could be going on I’d really appreciate >> any input. I’ll happily provide more information if I can. >> >> Thanks for reading :) >> Max >> >> >> > > > -- > Mariano > http://marianopeck.wordpress.com

1 2

Windows VM with latest MinGW: time_t issues
by phil＠highoctane.be 24 Nov '13

24 Nov '13

I have been attempting to build the Windows VM with the latest MinGW. Compared to my earlier attempts, I now got all plugins to build properly (error was due to a faulty download from files.pharo.org). Now, there is that message at link time that complains about time_t not being 32 bit (runtime message issued from Pharo.exe). Well, in 2013, time_t should be 64 bit, we'll have to look into that. I am trying to build with an additional -D_USE_32BIT_TIME_T to see if that changes anything. Anyone having had a look in these things? TIA Phil

2 2

VM Maker: VMMaker.oscog-eem.518.mcz
by commits＠source.squeak.org 23 Nov '13

23 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.518.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.518 Author: eem Time: 22 November 2013, 6:32:05.641 pm UUID: 47baf85e-eb07-401d-b604-8eeb30c62952 Ancestors: VMMaker.oscog-eem.517 Make sure dead code is not removed from plugin sources (if they're shared they can't be prematurely optimized). Fix compilation of Cog Spur VM. Remove extraneous type decl from threadSchedulingLoop:. Do a better job at generatign integer literals for flags. Simple solution for endless ergeneration of exampleSqNamedPrims.h. =============== Diff against VMMaker.oscog-eem.517 =============== Item was changed: ----- Method: CCodeGenerator>>cLiteralFor: (in category 'C code generator') ----- cLiteralFor: anObject "Return a string representing the C literal value for the given object." anObject isNumber ifTrue: [anObject isInteger ifTrue: [| printString | printString := (anObject > 0 and: [(anObject >> anObject lowBit + 1) isPowerOfTwo + and: [(anObject highBit = anObject lowBit and: [anObject > 65536]) + or: [anObject highBit - anObject lowBit >= 4]]]) - and: [anObject highBit - anObject lowBit >= 4]]) ifTrue: ['0x', (anObject printStringBase: 16)] ifFalse: [anObject printString]. ^anObject > 16rFFFFFFFF ifTrue: [printString, ObjectMemory unsignedLongLongSuffix] ifFalse: [anObject < 16r7FFFFFFF ifTrue: [printString] ifFalse: [printString, ObjectMemory unsignedIntegerSuffix]]]. anObject isFloat ifTrue: [^anObject printString]] ifFalse: [anObject isSymbol ifTrue: [^self cFunctionNameFor: anObject]. anObject isString ifTrue: [^'"', (anObject copyReplaceAll: (String with: Character cr) with: '\n') , '"']. anObject == nil ifTrue: [^ 'null' ]. anObject == true ifTrue: [^ '1' ]. anObject == false ifTrue: [^ '0' ]. anObject isCharacter ifTrue: [^anObject == $' ifTrue: ['''\'''''] "i.e. '\''" ifFalse: [anObject asString printString]]]. self error: 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString. ^'"XXX UNTRANSLATABLE CONSTANT XXX"'! Item was changed: ----- Method: CoInterpreterMT>>threadSchedulingLoop: (in category 'vm scheduling') ----- threadSchedulingLoop: vmThread "Enter a loop attempting to run the VM with the highest priority process and blocking on the thread's OS semaphore when unable to run that process. We will return to this via threadSwitchIfNecessary:from: which is called in the middle of transferTo:from: once the active process has been stored in the scheduler." <var: #vmThread type: #'CogVMThread *'> | attemptToRun | - <var: #dvmt type: #'CogVMThread *'> <inline: false> [self assert: vmThread state = CTMAssignableOrInVM. attemptToRun := false. (cogThreadManager getVMOwner = vmThread index) ifTrue: [attemptToRun := true] ifFalse: [(cogThreadManager tryLockVMToIndex: vmThread index) ifTrue: ["If relinquishing is true, then primitiveRelinquishProcessor has disowned the VM and only a returning call or callback should take ownership in that case." relinquishing ifTrue: [cogThreadManager releaseVM] ifFalse: [attemptToRun := true]]]. attemptToRun ifTrue: [self tryToExecuteSmalltalk: vmThread]. (cogThreadManager testVMOwnerIs: vmThread index) ifFalse: [cogThreadManager waitForWork: vmThread]. true] whileTrue! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genStoreSourceReg:slotIndex:destReg:scratchReg: (in category 'compile abstract instructions') ----- genStoreSourceReg: sourceReg slotIndex: index destReg: destReg scratchReg: scratchReg | jmpImmediate jmpDestYoung jmpSourceOld jmpAlreadyRemembered mask rememberedBitByteOffset | <var: #jmpImmediate type: #'AbstractInstruction *'> <var: #jmpDestYoung type: #'AbstractInstruction *'> <var: #jmpSourceOld type: #'AbstractInstruction *'> <var: #jmpAlreadyRemembered type: #'AbstractInstruction *'> "do the store" cogit MoveR: sourceReg Mw: index * objectMemory wordSize + objectMemory baseHeaderSize r: destReg. "now the check. Is value stored an integer? If so we're done" cogit MoveR: sourceReg R: scratchReg. cogit AndCq: objectMemory tagMask R: scratchReg. jmpImmediate := cogit JumpNonZero: 0. "Get the old/new boundary in scratchReg" + cogit MoveCw: objectMemory storeCheckBoundary R: scratchReg. - cogit MoveCw: objectMemory newSpaceLimit R: scratchReg. "Is target young? If so we're done" cogit CmpR: scratchReg R: destReg. "N.B. FLAGS := destReg - scratchReg" jmpDestYoung := cogit JumpBelow: 0. "Is value stored old? If so we're done." cogit CmpR: scratchReg R: sourceReg. "N.B. FLAGS := sourceReg - scratchReg" jmpSourceOld := cogit JumpAboveOrEqual: 0. "value is young and target is old. Need to remember this only if the remembered bit is not already set. Test the remembered bit. Only need to fetch the byte containing it, which reduces the size of the mask constant." rememberedBitByteOffset := jmpSourceOld isBigEndian ifTrue: [objectMemory baseHeaderSize - 1 - (objectMemory rememberedBitShift // 8)] ifFalse:[objectMemory rememberedBitShift // 8]. mask := 1 << (objectMemory rememberedBitShift \\ 8). "N.B. MoveMb:r:R: does not zero other bits" cogit MoveMb: rememberedBitByteOffset r: destReg R: scratchReg. cogit AndCq: mask R: scratchReg. jmpAlreadyRemembered := cogit JumpNonZero: 0. "Remembered bit is not set. Call store check to insert dest into remembered table." self assert: destReg == ReceiverResultReg. cogit CallRT: ceStoreCheckTrampoline. jmpImmediate jmpTarget: (jmpDestYoung jmpTarget: (jmpSourceOld jmpTarget: (jmpAlreadyRemembered jmpTarget: cogit Label))). ^0! Item was added: + ----- Method: InterpreterPlugin class>>shouldGenerateDeadCode (in category 'translation') ----- + shouldGenerateDeadCode + "Answer if the code generator should generate dead code, e.g. in false ifTrue: [dead] ifFalse: [live]. + Since plugin source is shared between different VM builds it is unsafe to assume any code is dead." + + ^true! Item was changed: ----- Method: SpurMemoryManager>>newSpaceLimit (in category 'accessing') ----- newSpaceLimit + <cmacro: '() GIV(newSpaceLimit)'> - <api> ^newSpaceLimit! Item was changed: ----- Method: SpurMemoryManager>>oldSpaceStart (in category 'accessing') ----- oldSpaceStart + <cmacro: '() GIV(oldSpaceStart)'> ^oldSpaceStart! Item was added: + ----- Method: SpurMemoryManager>>storeCheckBoundary (in category 'accessing') ----- + storeCheckBoundary + "A renaming for the Cogit, which couldn't make sense of GIV(newSpaceLimit)" + <api> + ^newSpaceLimit! Item was changed: ----- Method: VMMaker>>generateExportsFile (in category 'exports') ----- generateExportsFile "Store the exports on the given file" | cg contents filePath fileStream | + filePath := self interpreterExportsFilePath. + "don't bother endlessly regenerating the example file." + (internalPlugins isEmpty + and: [(filePath includesSubString: 'example') + and: [FileDirectory default fileExists: filePath]]) ifTrue: + [^self]. cg := self createCodeGenerator. cg vmClass: self interpreterClass. contents := String streamContents: [:s| s nextPutAll:'/* This is an automatically generated table of all builtin modules in the VM'; cr; next: 3 put: Character space; nextPutAll: (cg shortMonticelloDescriptionForClass: cg vmClass); cr; nextPutAll:' */'; cr. s cr; nextPutAll:'extern sqExport vm_exports[];'. s cr; nextPutAll: 'extern sqExport os_exports[];'. self internalPluginsDo:[:cls| s cr; nextPutAll: 'extern sqExport '; nextPutAll: cls moduleName; nextPutAll:'_exports[];'. ]. s cr. s cr; nextPutAll:'sqExport *pluginExports[] = {'. s crtab; nextPutAll:'vm_exports,'. s crtab; nextPutAll: 'os_exports,'. self internalPluginsDo:[:cls| s crtab; nextPutAll: cls moduleName; nextPutAll:'_exports,' ]. s crtab; nextPutAll:'NULL'. s cr; nextPutAll:'};'; cr]. - filePath := self interpreterExportsFilePath. (cg needToGenerateHeader: (FileDirectory baseNameFor: filePath) file: filePath contents: contents) ifTrue: [[fileStream := VMMaker forceNewFileNamed: filePath] on: FileDoesNotExistException do:[^self couldNotOpenFile: filePath]. fileStream nextPutAll: contents; close]!

1 0

[commit][2817] CogVM source as per VMMaker.oscog-eem.517
by commits＠squeakvm.org 23 Nov '13

23 Nov '13

Revision: 2817 Author: eliot Date: 2013-11-22 16:51:45 -0800 (Fri, 22 Nov 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.517 Move the defines for BaseHeaderSize BytesPerWord BytesPerOop out of interpreter, cogit or plugin source and into interp.h, and fix generateCPtrAsOop:on:indent: to print BaseHeaderSize symbolically so that plugin source can be safely shared. Include the executable name in the crash.dmp report. Fix uninitialization of newTargetMethodOrNil & errorSelectorOrNil in ceCPICMiss:receiver:. Do a better job of dead code removal, accepting constant comparisons. Lots of changes to Spur, find in Monticello but not relevant here as Spur is not yet ready for general consumption. Add the Cog Spur source to accompany the build dirs (doh!). Internal: Rewrite markLiteralsAndUnlinkIfUnmarkedSend:pc:method: & markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method: so that markAndTraceLiteral: is only invoked with literal args and cacheTagIsMarked: is only applied to cache tags. This allows Spur to answer true for cacheTagIsMarked:. Refactor (pop)storeLiteralVariable in the StackInterpreter so that all such bytecodes use storeLiteralVariable:withValue:. JFK RIP. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/DropPlugin/DropPlugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FT2Plugin/FT2Plugin.c branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c branches/Cog/src/plugins/SqueakSSL/SqueakSSL.c branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Added Paths: ----------- branches/Cog/spursrc/ branches/Cog/spursrc/examplePlugins.ext branches/Cog/spursrc/examplePlugins.int branches/Cog/spursrc/vm/ branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/exampleSqNamedPrims.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - AsynchFilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + AsynchFilePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -103,9 +102,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.497 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.517 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.497 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.517 (e)" #endif ; static void * sCOAFfn; Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - BalloonEnginePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + BalloonEnginePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -42,7 +42,6 @@ #define BEFormsIndex 3 #define BESpanIndex 1 #define BEWorkBufferIndex 0 -#define BytesPerWord 4 #define ETBalloonEdgeDataSize 6 #define ETIndexIndex 0 #define ETLinesIndex 4 @@ -840,9 +839,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.497 (i)" + "B2DPlugin VMMaker.oscog-eem.517 (i)" #else - "B2DPlugin VMMaker.oscog-eem.497 (e)" + "B2DPlugin VMMaker.oscog-eem.517 (e)" #endif ; static int* objBuffer; Modified: branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - BMPReadWriterPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + BMPReadWriterPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -37,7 +37,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -79,9 +78,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin VMMaker.oscog-eem.497 (i)" + "BMPReadWriterPlugin VMMaker.oscog-eem.517 (i)" #else - "BMPReadWriterPlugin VMMaker.oscog-eem.497 (e)" + "BMPReadWriterPlugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - BitBltSimulation VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + BitBltSimulation VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -63,7 +63,6 @@ #define BBWidthIndex 6 #define BinaryPoint 14 #define BlueIndex 2 -#define BytesPerWord 4 #define ColorMapFixedPart 2 #define ColorMapIndexedPart 4 #define ColorMapNewStyle 8 @@ -345,9 +344,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.497 (i)" + "BitBltPlugin VMMaker.oscog-eem.517 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.497 (e)" + "BitBltPlugin VMMaker.oscog-eem.517 (e)" #endif ; static sqInt noHalftone; Modified: branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c =================================================================== --- branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - DSAPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + DSAPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -37,7 +37,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -95,9 +94,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims VMMaker.oscog-eem.497 (i)" + "DSAPrims VMMaker.oscog-eem.517 (i)" #else - "DSAPrims VMMaker.oscog-eem.497 (e)" + "DSAPrims VMMaker.oscog-eem.517 (e)" #endif ; static sqInt remainderDigitCount; Modified: branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - DropPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + DropPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -81,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin VMMaker.oscog-eem.497 (i)" + "DropPlugin VMMaker.oscog-eem.517 (i)" #else - "DropPlugin VMMaker.oscog-eem.497 (e)" + "DropPlugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - FileCopyPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + FileCopyPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -37,7 +37,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -75,9 +74,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin VMMaker.oscog-eem.497 (i)" + "FileCopyPlugin VMMaker.oscog-eem.517 (i)" #else - "FileCopyPlugin VMMaker.oscog-eem.497 (e)" + "FileCopyPlugin VMMaker.oscog-eem.517 (e)" #endif ; @@ -133,8 +132,8 @@ if (failed()) { return null; } - srcSz = slotSizeOf(((sqInt)(long)(srcName) - 4)); - dstSz = slotSizeOf(((sqInt)(long)(dstName) - 4)); + srcSz = slotSizeOf(((sqInt)(long)(srcName) - BaseHeaderSize)); + dstSz = slotSizeOf(((sqInt)(long)(dstName) - BaseHeaderSize)); ok = sqCopyFilesizetosize(srcName, srcSz, dstName, dstSz); if (!ok) { primitiveFail(); Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - FilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + FilePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 #define COGMTVM 0 #define DirBadPath 2 #define DirNoMoreEntries 1 @@ -181,9 +180,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.497 (i)" + "FilePlugin VMMaker.oscog-eem.517 (i)" #else - "FilePlugin VMMaker.oscog-eem.497 (e)" + "FilePlugin VMMaker.oscog-eem.517 (e)" #endif ; static void * sCCPfn; Modified: branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - FloatArrayPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + FloatArrayPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -37,7 +37,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -113,9 +112,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin VMMaker.oscog-eem.497 (i)" + "FloatArrayPlugin VMMaker.oscog-eem.517 (i)" #else - "FloatArrayPlugin VMMaker.oscog-eem.497 (e)" + "FloatArrayPlugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - FloatMathPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + FloatMathPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -94,9 +93,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin VMMaker.oscog-eem.497 (i)" + "FloatMathPlugin VMMaker.oscog-eem.517 (i)" #else - "FloatMathPlugin VMMaker.oscog-eem.497 (e)" + "FloatMathPlugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - NewsqueakIA32ABIPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + NewsqueakIA32ABIPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -53,9 +53,6 @@ /*** Constants ***/ -#define BaseHeaderSize 4 -#define BytesPerOop 4 -#define BytesPerWord 4 #define PrimErrBadArgument 3 #define PrimErrBadIndex 4 #define PrimErrBadReceiver 2 @@ -223,9 +220,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-eem.497 (i)" + "IA32ABI VMMaker.oscog-eem.517 (i)" #else - "IA32ABI VMMaker.oscog-eem.497 (e)" + "IA32ABI VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - JPEGReadWriter2Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + JPEGReadWriter2Plugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -104,9 +103,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin VMMaker.oscog-eem.497 (i)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.517 (i)" #else - "JPEGReadWriter2Plugin VMMaker.oscog-eem.497 (e)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - JPEGReaderPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + JPEGReaderPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -39,7 +39,6 @@ /*** Constants ***/ #define BlockWidthIndex 5 #define BlueIndex 2 -#define BytesPerWord 4 #define ConstBits 13 #define CurrentXIndex 0 #define CurrentYIndex 1 @@ -181,9 +180,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin VMMaker.oscog-eem.497 (i)" + "JPEGReaderPlugin VMMaker.oscog-eem.517 (i)" #else - "JPEGReaderPlugin VMMaker.oscog-eem.497 (e)" + "JPEGReaderPlugin VMMaker.oscog-eem.517 (e)" #endif ; static int *residuals; Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - LargeIntegersPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + LargeIntegersPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -37,7 +37,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -173,9 +172,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.497 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.517 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.497 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.517 (e)" #endif ; static const int orOpIndex = 1; Modified: branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - Matrix2x3Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + Matrix2x3Plugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -37,7 +37,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -118,9 +117,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin VMMaker.oscog-eem.497 (i)" + "Matrix2x3Plugin VMMaker.oscog-eem.517 (i)" #else - "Matrix2x3Plugin VMMaker.oscog-eem.497 (e)" + "Matrix2x3Plugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,13 +1,13 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - MiscPrimitivePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + MiscPrimitivePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795 ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85\n\ +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35\n\ Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795\n\ ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ @@ -84,7 +84,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Variables ***/ @@ -95,9 +94,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.497 (i)" + "MiscPrimitivePlugin VMMaker.oscog-eem.517 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.497 (e)" + "MiscPrimitivePlugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - RePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + RePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -127,9 +126,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin VMMaker.oscog-eem.497 (i)" + "RePlugin VMMaker.oscog-eem.517 (i)" #else - "RePlugin VMMaker.oscog-eem.497 (e)" + "RePlugin VMMaker.oscog-eem.517 (e)" #endif ; static int netMemory = 0; Modified: branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - SecurityPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SecurityPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -97,9 +96,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SecurityPlugin VMMaker.oscog-eem.497 (i)" + "SecurityPlugin VMMaker.oscog-eem.517 (i)" #else - "SecurityPlugin VMMaker.oscog-eem.497 (e)" + "SecurityPlugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - SocketPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SocketPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -180,9 +179,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SocketPlugin VMMaker.oscog-eem.497 (i)" + "SocketPlugin VMMaker.oscog-eem.517 (i)" #else - "SocketPlugin VMMaker.oscog-eem.497 (e)" + "SocketPlugin VMMaker.oscog-eem.517 (e)" #endif ; static void * sCCLOPfn; @@ -284,7 +283,7 @@ { sqInt sz; - sz = byteSizeOf(((sqInt)(long)(ptrToByteArray) - 4)); + sz = byteSizeOf(((sqInt)(long)(ptrToByteArray) - BaseHeaderSize)); if (!(sz == 4)) { return primitiveFail(); } @@ -402,8 +401,8 @@ return null; } if (!(failed())) { - hostSize = byteSizeOf(((sqInt)(long)(hostName) - 4)); - servSize = byteSizeOf(((sqInt)(long)(servName) - 4)); + hostSize = byteSizeOf(((sqInt)(long)(hostName) - BaseHeaderSize)); + servSize = byteSizeOf(((sqInt)(long)(servName) - BaseHeaderSize)); sqResolverGetAddressInfoHostSizeServiceSizeFlagsFamilyTypeProtocol(hostName, hostSize, servName, servSize, flags, family, type, protocol); } if (failed()) { @@ -485,7 +484,7 @@ return null; } if (!(failed())) { - addrSize = byteSizeOf(((sqInt)(long)(socketAddress) - 4)); + addrSize = byteSizeOf(((sqInt)(long)(socketAddress) - BaseHeaderSize)); sqResolverGetAddressInfoResultSize(socketAddress, addrSize); } if (failed()) { @@ -574,7 +573,7 @@ return null; } if (!(failed())) { - addrSize = byteSizeOf(((sqInt)(long)(socketName) - 4)); + addrSize = byteSizeOf(((sqInt)(long)(socketName) - BaseHeaderSize)); sqResolverGetNameInfoHostResultSize(socketName, addrSize); } if (failed()) { @@ -617,7 +616,7 @@ return null; } if (!(failed())) { - addrSize = byteSizeOf(((sqInt)(long)(socketName) - 4)); + addrSize = byteSizeOf(((sqInt)(long)(socketName) - BaseHeaderSize)); sqResolverGetNameInfoServiceResultSize(socketName, addrSize); } if (failed()) { @@ -660,7 +659,7 @@ return null; } if (!(failed())) { - nameSize = byteSizeOf(((sqInt)(long)(nameString) - 4)); + nameSize = byteSizeOf(((sqInt)(long)(nameString) - BaseHeaderSize)); sqResolverHostNameResultSize(nameString, nameSize); } if (failed()) { @@ -736,7 +735,7 @@ return null; } /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - BaseHeaderSize)); if (!(sz == 4)) { addr = primitiveFail(); goto l1; @@ -765,7 +764,7 @@ return null; } if (!(failed())) { - sz = byteSizeOf(((sqInt)(long)(name) - 4)); + sz = byteSizeOf(((sqInt)(long)(name) - BaseHeaderSize)); sqResolverStartNameLookup(name, sz); } if (failed()) { @@ -1009,7 +1008,7 @@ return null; } /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - BaseHeaderSize)); if (!(sz == 4)) { addr = primitiveFail(); goto l1; @@ -1138,7 +1137,7 @@ return null; } /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - BaseHeaderSize)); if (!(sz == 4)) { addr = primitiveFail(); goto l1; @@ -1520,7 +1519,7 @@ } } /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) ifAddr))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) ifAddr))) - BaseHeaderSize)); if (!(sz == 4)) { addr = primitiveFail(); goto l1; @@ -2096,7 +2095,7 @@ arrayBase = ((char *) (firstIndexableField(array))); bufStart = arrayBase + ((startIndex - 1) * byteSize); /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) hostAddress))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) hostAddress))) - BaseHeaderSize)); if (!(sz == 4)) { address = primitiveFail(); goto l1; Modified: branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - SoundPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SoundPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -111,9 +110,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundPlugin VMMaker.oscog-eem.497 (i)" + "SoundPlugin VMMaker.oscog-eem.517 (i)" #else - "SoundPlugin VMMaker.oscog-eem.497 (e)" + "SoundPlugin VMMaker.oscog-eem.517 (e)" #endif ; @@ -259,7 +258,7 @@ if (failed()) { return null; } - success(frameCount <= (slotSizeOf(((sqInt)(long)(buf) - 4)))); + success(frameCount <= (slotSizeOf(((sqInt)(long)(buf) - BaseHeaderSize)))); if (!(failed())) { framesPlayed = snd_InsertSamplesFromLeadTime(frameCount, (void *)buf, leadTime); success(framesPlayed >= 0); @@ -292,7 +291,7 @@ return null; } success((startIndex >= 1) - && (((startIndex + frameCount) - 1) <= (slotSizeOf(((sqInt)(long)(buf) - 4))))); + && (((startIndex + frameCount) - 1) <= (slotSizeOf(((sqInt)(long)(buf) - BaseHeaderSize))))); if (!(failed())) { framesPlayed = snd_PlaySamplesFromAtLength(frameCount, (void *)buf, startIndex - 1); success(framesPlayed >= 0); @@ -351,7 +350,7 @@ return null; } if (!(failed())) { - bufSizeInBytes = (slotSizeOf(((sqInt)(long)(buf) - 4))) * 4; + bufSizeInBytes = (slotSizeOf(((sqInt)(long)(buf) - BaseHeaderSize))) * 4; success((startWordIndex >= 1) && (((startWordIndex - 1) * 2) < bufSizeInBytes)); } Modified: branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c =================================================================== --- branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from SqueakSSLPlugin SqueakSSL-Plugin-ar.3 uuid: b76dbadd-ee96-5e44-abbb-8a0e3e17240a */ @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ Modified: branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - UUIDPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + UUIDPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -38,7 +38,6 @@ /*** Constants ***/ -#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -76,9 +75,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UUIDPlugin VMMaker.oscog-eem.497 (i)" + "UUIDPlugin VMMaker.oscog-eem.517 (i)" #else - "UUIDPlugin VMMaker.oscog-eem.497 (e)" + "UUIDPlugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - UnixOSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4 + UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f */ -static char __buildInfo[] = "UnixOSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4 " __DATE__ ; +static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f " __DATE__ ; /* D T Lewis - UnixOSProcessPlugin.c translated from class UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -52,7 +52,6 @@ /*** Constants ***/ -#define BytesPerWord 4 #define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ #define PrimErrBadArgument 3 #define PrimErrBadNumArgs 5 @@ -319,9 +318,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 (i)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (i)" #else - "UnixOSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 (e)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (e)" #endif ; static void *originalSigHandlers[NSIG]; Modified: branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMProfileLinuxSupportPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -42,7 +42,6 @@ /*** Constants ***/ -#define BytesPerWord 4 #define PrimErrBadArgument 3 #define PrimErrInappropriate 6 #define PrimErrNoMemory 9 @@ -104,9 +103,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 (i)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.517 (i)" #else - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 (e)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.517 (e)" #endif ; static sqInt numModules; Modified: branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - VMProfileMacSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMProfileMacSupportPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -40,7 +40,6 @@ /*** Constants ***/ -#define BytesPerWord 4 #define PrimErrBadArgument 3 @@ -103,9 +102,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileMacSupportPlugin VMMaker.oscog-eem.497 (i)" + "VMProfileMacSupportPlugin VMMaker.oscog-eem.517 (i)" #else - "VMProfileMacSupportPlugin VMMaker.oscog-eem.497 (e)" + "VMProfileMacSupportPlugin VMMaker.oscog-eem.517 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4 + Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f */ -static char __buildInfo[] = "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4 " __DATE__ ; +static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f " __DATE__ ; /* D T Lewis - Win32OSProcessPlugin.c translated from class Win32OSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -45,7 +45,6 @@ /*** Constants ***/ -#define BytesPerWord 4 #define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ #define PrimErrBadArgument 3 #define READCHARARRAYSIZE 512 /* Corresponds to expected max size of external semaphore table */ @@ -226,9 +225,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 (i)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (i)" #else - "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 (e)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (e)" #endif ; static int osprocessSandboxSecurity; Modified: branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.498 uuid: 429d3a33-5318-4130-addb-342eaffe0c23 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - DeflatePlugin VMMaker.oscog-eem.498 uuid: 429d3a33-5318-4130-addb-342eaffe0c23 + DeflatePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.498 uuid: 429d3a33-5318-4130-addb-342eaffe0c23 " __DATE__ ; +static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; @@ -37,7 +37,6 @@ /*** Constants ***/ -#define BytesPerWord 4 #define DeflateHashMask 0x7FFF #define DeflateHashShift 5 #define DeflateHashTableSize 32768 @@ -137,9 +136,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ZipPlugin VMMaker.oscog-eem.498 (i)" + "ZipPlugin VMMaker.oscog-eem.517 (i)" #else - "ZipPlugin VMMaker.oscog-eem.498 (e)" + "ZipPlugin VMMaker.oscog-eem.517 (e)" #endif ; static unsigned int zipBaseDistance[] = { Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 + CCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - StackToRegisterMappingCogit VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 + StackToRegisterMappingCogit VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -129,10 +129,7 @@ #define ArithmeticShiftRightCqR 71 #define ArithmeticShiftRightRR 72 #define BadRegisterSet 1 -#define BaseHeaderSize 4 #define BlockCreationBytecodeSize 4 -#define BytesPerOop 4 -#define BytesPerWord 4 #define Call 9 #define CDQ 105 #define ClassMethodContextCompactIndex 14 @@ -255,7 +252,7 @@ #define MapEnd 0 #define MaxCompiledPrimitiveIndex 222 #define MaxMethodSize 65535 -#define MaxNegativeErrorCode -6 +#define MaxNegativeErrorCode -7 #define MaxNumArgs 15 #define MaxStackAllocSize 1572864 #define MaxStackCheckOffset 0xFFF @@ -338,6 +335,7 @@ #define SubRR 79 #define TempReg -4 #define TypeMask 0x3 +#define UnimplementedPrimitive -7 #define ValueIndex 1 #define XCHGAwR 115 #define XCHGMwrR 116 @@ -828,9 +826,6 @@ static sqInt hasPCDependentInstructions(AbstractInstruction * self_in_hasPCDependentInstructions); static sqInt hasSSE2Instructions(AbstractInstruction * self_in_hasSSE2Instructions); static sqInt hasSSEInstructions(AbstractInstruction * self_in_hasSSEInstructions); -static sqInt implementsNew(void); -static sqInt implementsNewMethod(void); -static sqInt implementsNewWithArg(void); static sqInt incrementUsageOfTargetIfLinkedSendmcpcignored(sqInt annotation, char *mcpc, sqInt superfluity); static sqInt initialClosedPICUsageCount(void); static void initializeBackend(void); @@ -903,8 +898,7 @@ static void mapObjectReferencesInGeneratedRuntime(void); static void mapObjectReferencesInMachineCodeForBecome(void); static void mapObjectReferencesInMachineCodeForFullGC(void); -static void mapObjectReferencesInMachineCodeForIncrementalGC(void); -static void mapObjectReferencesInMachineCodeForScavenge(void); +static void mapObjectReferencesInMachineCodeForYoungGC(void); void mapObjectReferencesInMachineCode(sqInt gcMode); static void markAndTraceLiteralIfYoung(sqInt literal); static void markAndTraceLiteral(sqInt literal); @@ -950,9 +944,6 @@ static sqInt numMethods(void); sqInt numMethodsOfType(sqInt cogMethodType); static sqInt numSmallIntegerBits(void); -static sqInt objectRepresentationImplementsNewMethod(sqInt primIndex); -static sqInt objectRepresentationImplementsNewWithArg(sqInt primIndex); -static sqInt objectRepresentationImplementsNew(sqInt primIndex); static sqInt occurrencesInYoungReferrers(CogMethod *cogMethod); static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop); static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop); @@ -999,7 +990,7 @@ static sqInt relocateMethodsPreCompaction(void); static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr); static sqInt remapNSIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr); -static sqInt remapObj(sqInt oop); +static sqInt remapObject(sqInt oop); static sqInt remapOop(sqInt oop); static sqInt removeFromOpenPICList(CogMethod *anOpenPIC); static sqInt removeFromUnpairedMethodList(CogMethod *aCogMethod); @@ -1060,6 +1051,7 @@ sqInt traceLinkedSendOffset(void); static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs); static sqInt twoByteInstructionSizeAt(AbstractInstruction * self_in_twoByteInstructionSizeAt, sqInt pc); +static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); static sqInt unlinkIfLinkedSendToFreepcignored(sqInt annotation, char *mcpc, sqInt superfluity); @@ -1800,8 +1792,8 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { genPrimitiveNew, 0, objectRepresentationImplementsNew }, - { genPrimitiveNewWithArg, 1, objectRepresentationImplementsNewWithArg }, + { genPrimitiveNew, 0, 0 }, + { genPrimitiveNewWithArg, 1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -1809,7 +1801,7 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { genPrimitiveNewMethod, 2, objectRepresentationImplementsNewMethod }, + { genPrimitiveNewMethod, 2, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -2385,7 +2377,7 @@ annotateobjRef(AbstractInstruction *abstractInstruction, sqInt anOop) { if (shouldAnnotateObjectReference(anOop)) { - if (isYoung(anOop)) { + if (isYoungObject(anOop)) { hasYoungReferent = 1; } return annotatewith(abstractInstruction, IsObjectReference); @@ -2717,6 +2709,9 @@ l1: /* end lookup:for:methodAndErrorSelectorInto: */; } + else { + newTargetMethodOrNil = (errorSelectorOrNil = null); + } assert(outerReturn == (stackTop())); cacheTag = inlineCacheTagForInstance(receiver); if ((((cPIC->cPICNumCases)) >= numPICCases) @@ -3127,7 +3122,7 @@ ok = 0; } if (!fullGCFlag) { - if (((isYoung((cogMethod->methodObject))) + if (((isYoungObject((cogMethod->methodObject))) || (isYoung((cogMethod->selector)))) @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.517.mcz
by commits＠source.squeak.org 23 Nov '13

23 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.517.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.517 Author: eem Time: 22 November 2013, 3:23:32.735 pm UUID: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 Ancestors: VMMaker.oscog-eem.516 Move the defines for BaseHeaderSize BytesPerWord BytesPerOop out of interpreter, cogit or plugin source and into interp.h, and fix generateCPtrAsOop:on:indent: to print BaseHeaderSize symbolically so that plugin source can be safely shared. Reorder the memory regions in Spur to put the code zone between newSpace (low) and oldSpace (high). Hence avoid two range checks when scavenging. If the codeZone is below newSpace then copyAndForward: must check for both <= newSpaceLimit and >= newSpaceStart) to filter-out cogMethods. Add a checkMemoryMap assert to various SpurMemMgr classes and check it on scavenge. Replace several uses of startOfMemory by the relevant start and fix related asserts. Add oldSpaceStart and use in place of newSpaceLimit in the relevant places. Add isOldObject: and use in beRootIfOld:. Place the guardPage below newSpace in Spur. Change simulateCogCodeAt: et al to use the new run/single-step primitives that allow the read-only/executable range to be origined at other than zero. Needs Cog-eem.122 to be able to simulate. Refactor recording simulated instructions into recordProcessing. Add those primitives to the processor alien plugins. Simplify generating machine-code new/new:/newMethod by introducing an UnimplementedPrimitive error and nuking implementsNew et al. Nuke addressCouldBeObjWhileScavenging:. Fix bug in inferTypesForImplicitlyTypedVariablesIn: that would strip lewading u form explicitly typed vars such as unsigned char over. JFK RIP. =============== Diff against VMMaker.oscog-eem.516 =============== Item was changed: ----- Method: CCodeGenerator>>emitCConstantsOn: (in category 'C code generator') ----- emitCConstantsOn: aStream "Store the global variable declarations on the given stream." | unused constList | unused := constants keys asSet. "Don't generate any defines for the externally defined constants, STACKVM, COGVM, COGMTVM et al, unless they're actually used." (VMClass class>>#initializeMiscConstants) literalsDo: [:lit| (lit isVariableBinding and: [lit key isString]) ifTrue: [unused add: lit key]]. methods do: [:meth| meth declarations keysDo: [:v| (meth typeFor: v in: self) ifNotNil: [:type| unused remove: type ifAbsent: []]]. unused remove: meth returnType ifAbsent: []. meth parseTree nodesDo: [:n| n isConstant ifTrue: [unused remove: n name ifAbsent: []]]]. unused copy do: [:const| (variableDeclarations anySatisfy: [:value| value includesSubString: const]) ifTrue: [unused remove: const ifAbsent: []]]. + "and VMBasicConstants mostBasicConstantNames *must* be taken from interp.h" + unused addAll: VMBasicConstants mostBasicConstantNames. - unused remove: #BytesPerWord ifAbsent: []. "force inclusion of BytesPerWord declaration" - unused remove: #BaseHeaderSize ifAbsent: []. "force inclusion of BaseHeaderSize declaration" constList := constants keys reject: [:any| unused includes: any]. aStream cr; nextPutAll: '/*** Constants ***/'; cr. (self sortStrings: constList) do: [:varName| | node default value | node := constants at: varName. node name isEmpty ifFalse: ["If the definition includes a C comment, take it as is, otherwise convert the value from Smalltalk to C. Allow the class to provide an alternative definition, either of just the value or the whole shebang." default := (node value isString and: [node value includesSubString: '/*']) ifTrue: [node value] ifFalse: [self cLiteralFor: node value name: varName]. value := vmClass ifNotNil: [(vmClass specialValueForConstant: node name default: default) ifNotNil: [:specialDef| specialDef] ifNil: [default]] ifNil: [default]. value first ~= $# ifTrue: [aStream nextPutAll: '#define '; nextPutAll: node name; space]. aStream nextPutAll: value; cr]]. aStream cr! Item was changed: ----- Method: CoInterpreter>>initializeCodeGenerator (in category 'initialization') ----- initializeCodeGenerator + objectMemory hasSpurMemoryManagerAPI + ifTrue: + [cogit + initializeCodeZoneFrom: objectMemory newSpaceLimit + upTo: objectMemory newSpaceLimit + cogCodeSize] + ifFalse: + [cogit + initializeCodeZoneFrom: (self cCode: [objectMemory memory] inSmalltalk: [Cogit guardPageSize]) + upTo: (self cCode: [objectMemory memory] inSmalltalk: [Cogit guardPageSize]) + cogCodeSize]! - cogit - initializeCodeZoneFrom: (self cCode: [objectMemory memory] inSmalltalk: [0]) - upTo: (self cCode: [objectMemory memory] inSmalltalk: [0]) + cogCodeSize! Item was changed: ----- Method: CoInterpreter>>isCogMethodReference: (in category 'compiled methods') ----- isCogMethodReference: methodHeader <api> self assert: ((objectMemory isIntegerObject: methodHeader) + or: [methodHeader asUnsignedInteger < cogit maxCogMethodAddress - or: [methodHeader asUnsignedInteger < objectMemory startOfMemory and: [methodHeader asUnsignedInteger >= cogit minCogMethodAddress]]). ^objectMemory isNonIntegerObject: methodHeader! Item was changed: ----- Method: CoInterpreterStackPages>>initializeStack:numSlots:pageSize: (in category 'initialization') ----- initializeStack: theStackPages numSlots: stackSlots pageSize: slotsPerPage "Initialize the stack pages. In the C VM theStackPages will be alloca'ed memory to hold the stack pages on the C stack. In the simulator they are housed in the memory between the cogMethodZone and the heap." <var: #theStackPages type: #'char *'> <returnTypeC: #void> | numPages page structStackPageSize pageStructBase count | <var: #page type: #'StackPage *'> <var: #pageStructBase type: #'char *'> self cCode: [] inSmalltalk: + [objectMemory hasSpurMemoryManagerAPI + ifTrue: + [self assert: objectMemory oldSpaceStart - objectMemory newSpaceLimit - coInterpreter cogCodeSize - coInterpreter methodCacheSize - coInterpreter primTraceLogSize - coInterpreter rumpCStackSize - Cogit guardPageSize + = (stackSlots * BytesPerWord roundUpTo: objectMemory allocationUnit)] + ifFalse: + [self assert: objectMemory startOfMemory - coInterpreter cogCodeSize - coInterpreter methodCacheSize - coInterpreter primTraceLogSize - coInterpreter rumpCStackSize - Cogit guardPageSize + = (stackSlots * BytesPerWord roundUpTo: objectMemory allocationUnit)]]. - [self assert: objectMemory startOfMemory - coInterpreter cogCodeSize - coInterpreter methodCacheSize - coInterpreter primTraceLogSize - coInterpreter rumpCStackSize - = (stackSlots * BytesPerWord roundUpTo: objectMemory allocationUnit)]. structStackPageSize := coInterpreter sizeof: InterpreterStackPage. bytesPerPage := slotsPerPage * BytesPerWord. numPages := coInterpreter numStkPages. "Because stack pages grow down baseAddress is at the top of a stack page and so to avoid subtracting BytesPerWord from baseAddress and lastAddress in the init loop below we simply push the stackPage array up one word to avoid the overlap. This word is extraStackBytes." pageStructBase := theStackPages + (numPages * bytesPerPage) + BytesPerWord. pages := self cCode: [self cCoerceSimple: pageStructBase to: #'StackPage *'] inSmalltalk: [pageMap := Dictionary new. ((0 to: numPages - 1) collect: [:i| InterpreterStackPage surrogateClass new address: pageStructBase + (i * structStackPageSize) simulator: coInterpreter zoneBase: coInterpreter stackZoneBase zoneLimit: objectMemory startOfMemory]) do: [:pageSurrogate| pageMap at: pageSurrogate address put: pageSurrogate]; yourself]. "make sure there's enough headroom" self assert: coInterpreter stackPageByteSize - coInterpreter stackLimitBytes - coInterpreter stackLimitOffset >= coInterpreter stackPageHeadroom. 0 to: numPages - 1 do: [:index| page := self stackPageAt: index. page lastAddress: theStackPages + (index * bytesPerPage); baseAddress: page lastAddress + bytesPerPage; stackLimit: page baseAddress - coInterpreter stackLimitBytes; realStackLimit: page stackLimit; baseFP: 0; nextPage: (self stackPageAt: (index = (numPages - 1) ifTrue: [0] ifFalse: [index + 1])); prevPage: (self stackPageAt: (index = 0 ifTrue: [numPages - 1] ifFalse: [index - 1]))]. "Now compute stackBasePlus1 so that the pageIndexFor: call maps all addresses from aPage baseAddress to aBase limitAddress + 1 to the same index (stacks grow down)" stackBasePlus1 := (self cCoerceSimple: theStackPages to: #'char *') + 1. self cCode: [] inSmalltalk: [minStackAddress := theStackPages. maxStackAddress := theStackPages + (numPages * bytesPerPage) + BytesPerWord - 1]. "The overflow limit is the amount of stack to retain when moving frames from an overflowing stack to reduce thrashing. See stackOverflowOrEvent:mayContextSwitch:" page := self stackPageAt: 0. overflowLimit := page baseAddress - page realStackLimit * 3 // 5. 0 to: numPages - 1 do: [:index| page := self stackPageAt: index. self assert: (self pageIndexFor: page baseAddress) == index. self assert: (self pageIndexFor: page baseAddress - (slotsPerPage - 1 * BytesPerWord)) == index. self assert: (self stackPageFor: page baseAddress) == page. self assert: (self stackPageFor: page stackLimit) == page. self cCode: [] inSmalltalk: [| memIndex | memIndex := index * slotsPerPage + 1. "this is memIndex in the block above" self assert: (self memIndexFor: (self oopForPointer: page baseAddress)) == (memIndex + slotsPerPage - 1). index < (numPages - 1) ifTrue: [self assert: (self stackPageFor: page baseAddress + BytesPerWord) == (self stackPageAt: index + 1)]]. coInterpreter initializePageTraceToInvalid: page]. mostRecentlyUsedPage := self stackPageAt: 0. page := mostRecentlyUsedPage. count := 0. [| theIndex | count := count + 1. theIndex := self pageIndexFor: page baseAddress. self assert: (self stackPageAt: theIndex) == page. self assert: (self pageIndexFor: page baseAddress) == theIndex. self assert: (self pageIndexFor: page stackLimit) == theIndex. self assert: (self pageIndexFor: page lastAddress + 1) == theIndex. (page := page nextPage) ~= mostRecentlyUsedPage] whileTrue. self assert: count == numPages. self assert: self pageListIsWellFormed! Item was added: + ----- Method: CogMethodZone>>zoneEnd: (in category 'simulation only') ----- + zoneEnd: zoneEnd + <doNotGenerate> + limitAddress := zoneEnd! Item was changed: ----- Method: CogObjectRepresentation>>genInnerPrimitiveNew: (in category 'primitive generators') ----- genInnerPrimitiveNew: retNoffset + "subclasses override if they can" + ^cogit unimplementedPrimitive! - self subclassResponsibility. - ^0! Item was changed: ----- Method: CogObjectRepresentation>>genInnerPrimitiveNewMethod: (in category 'primitive generators') ----- genInnerPrimitiveNewMethod: retNoffset + "subclasses override if they can" + ^cogit unimplementedPrimitive! - self subclassResponsibility. - ^0! Item was changed: ----- Method: CogObjectRepresentation>>genInnerPrimitiveNewWithArg: (in category 'primitive generators') ----- genInnerPrimitiveNewWithArg: retNoffset + "subclasses override if they can" + ^cogit unimplementedPrimitive! - self subclassResponsibility! Item was removed: - ----- Method: CogObjectRepresentation>>implementsNew (in category 'initialization') ----- - implementsNew - ^false! Item was removed: - ----- Method: CogObjectRepresentation>>implementsNewMethod (in category 'initialization') ----- - implementsNewMethod - ^false! Item was removed: - ----- Method: CogObjectRepresentation>>implementsNewWithArg (in category 'initialization') ----- - implementsNewWithArg - ^false! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genStoreSourceReg:slotIndex:destReg:scratchReg: (in category 'compile abstract instructions') ----- genStoreSourceReg: sourceReg slotIndex: index destReg: destReg scratchReg: scratchReg | jmpImmediate jmpDestYoung jmpSourceOld jmpAlreadyRemembered mask rememberedBitByteOffset | <var: #jmpImmediate type: #'AbstractInstruction *'> <var: #jmpDestYoung type: #'AbstractInstruction *'> <var: #jmpSourceOld type: #'AbstractInstruction *'> <var: #jmpAlreadyRemembered type: #'AbstractInstruction *'> "do the store" cogit MoveR: sourceReg Mw: index * objectMemory wordSize + objectMemory baseHeaderSize r: destReg. "now the check. Is value stored an integer? If so we're done" cogit MoveR: sourceReg R: scratchReg. cogit AndCq: objectMemory tagMask R: scratchReg. jmpImmediate := cogit JumpNonZero: 0. "Get the old/new boundary in scratchReg" + cogit MoveCw: objectMemory newSpaceLimit R: scratchReg. - cogit MoveAw: objectMemory newSpaceLimitAddress R: scratchReg. "Is target young? If so we're done" cogit CmpR: scratchReg R: destReg. "N.B. FLAGS := destReg - scratchReg" jmpDestYoung := cogit JumpBelow: 0. "Is value stored old? If so we're done." cogit CmpR: scratchReg R: sourceReg. "N.B. FLAGS := sourceReg - scratchReg" jmpSourceOld := cogit JumpAboveOrEqual: 0. "value is young and target is old. Need to remember this only if the remembered bit is not already set. Test the remembered bit. Only need to fetch the byte containing it, which reduces the size of the mask constant." rememberedBitByteOffset := jmpSourceOld isBigEndian ifTrue: [objectMemory baseHeaderSize - 1 - (objectMemory rememberedBitShift // 8)] ifFalse:[objectMemory rememberedBitShift // 8]. mask := 1 << (objectMemory rememberedBitShift \\ 8). "N.B. MoveMb:r:R: does not zero other bits" cogit MoveMb: rememberedBitByteOffset r: destReg R: scratchReg. cogit AndCq: mask R: scratchReg. jmpAlreadyRemembered := cogit JumpNonZero: 0. "Remembered bit is not set. Call store check to insert dest into remembered table." self assert: destReg == ReceiverResultReg. cogit CallRT: ceStoreCheckTrampoline. jmpImmediate jmpTarget: (jmpDestYoung jmpTarget: (jmpSourceOld jmpTarget: (jmpAlreadyRemembered jmpTarget: cogit Label))). ^0! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>implementsNew (in category 'initialization') ----- - implementsNew - ^true! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>implementsNewWithArg (in category 'initialization') ----- - implementsNewWithArg - ^true! Item was changed: ----- Method: CogStackPageSurrogate32>>trace (in category 'accessing') ----- trace + ^memory longAt: address + 29! - ^memory unsignedLongAt: address + 29! Item was changed: ----- Method: CogStackPageSurrogate32>>trace: (in category 'accessing') ----- trace: aValue self assert: (address + 28 >= zoneBase and: [address + 31 < zoneLimit]). + ^memory longAt: address + 29 put: aValue! - ^memory unsignedLongAt: address + 29 put: (16rFFFFFFFF bitAnd: aValue)! Item was changed: ----- Method: CogStackPageSurrogate64>>trace (in category 'accessing') ----- trace + ^memory longAt: address + 57! - ^memory unsignedLongAt: address + 57! Item was changed: ----- Method: CogStackPageSurrogate64>>trace: (in category 'accessing') ----- trace: aValue self assert: (address + 56 >= zoneBase and: [address + 59 < zoneLimit]). + ^memory longAt: address + 57 put: aValue! - ^memory unsignedLongAt: address + 57 put: aValue! Item was changed: ----- Method: CogVMSimulator>>fetchPointer:ofObject: (in category 'interpreter access') ----- fetchPointer: fieldIndex ofObject: oop "index by word size, and return a pointer as long as the word size" + self assert: (objectMemory cheapIsInMemory: oop). - self assert: oop >= objectMemory startOfMemory. ^objectMemory fetchPointer: fieldIndex ofObject: oop! Item was added: + ----- Method: CogVMSimulator>>heapBase: (in category 'accessing') ----- + heapBase: anObject + "Set the value of heapBase; used by the Spur CoSimulator to reposition cog code between newSpace and oldSpace." + + ^heapBase := anObject! Item was changed: ----- Method: CogVMSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "CogVMSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize count heapSize oldBaseAddr bytesToShift swapBytes hdrNumStackPages hdrEdenBytes hdrCogCodeSize stackZoneSize methodCacheSize headerFlags primTraceLogSize firstSegSize hdrMaxExtSemTabSize | "open image file and read the header" ["begin ensure block..." f := FileStream readOnlyFileNamed: fileName. imageName := f fullName. f binary. version := self nextLongFrom: f. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getLongFromFile: f swap: swapBytes. heapSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. stackZoneSize := self computeStackZoneSize. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [self defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. desiredCogCodeSize := hdrCogCodeSize. self assert: f position = 40. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = 48. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "For Open PICs to be able to probe the method cache during simulation the methodCache must be relocated to memory." methodCacheSize := methodCache size * BytesPerWord. primTraceLogSize := primTraceLog size * BytesPerWord. "allocate interpreter memory. This list is in address order, low to high. In the actual VM the stack zone exists on the C stack." + heapBase := (Cogit guardPageSize + + cogCodeSize - heapBase := (cogCodeSize + stackZoneSize + methodCacheSize + primTraceLogSize + self rumpCStackSize) roundUpTo: objectMemory allocationUnit. objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes + extraBytes endOfMemory: heapBase + heapSize. self assert: cogCodeSize \\ 4 = 0. self assert: objectMemory memoryLimit \\ 4 = 0. self assert: self rumpCStackSize \\ 4 = 0. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. objectMemory memory: ((cogit processor endianness == #little ifTrue: [LittleEndianBitmap] ifFalse: [Bitmap]) new: objectMemory memoryLimit // 4). count := objectMemory readHeapFromImageFile: f dataBytes: heapSize. count ~= heapSize ifTrue: [self halt]. ] ensure: [f close]. + self moveMethodCacheToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize. + self movePrimTraceLogToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize + methodCacheSize. - self moveMethodCacheToMemoryAt: cogCodeSize + stackZoneSize. - self movePrimTraceLogToMemoryAt: cogCodeSize + stackZoneSize + methodCacheSize. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. self initializeCodeGenerator! Item was changed: ----- Method: CogVMSimulator>>stackZoneBase (in category 'stack pages') ----- stackZoneBase "In the simulator the stack zone starts immediately after the code zone." + ^objectMemory cogCodeBase + cogCodeSize! - ^cogCodeSize! 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 postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMissCall missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxMethodBefore maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceClosureCopyTrampoline ceCreateNewArrayTrampoline ceEnterCogCodePopReceiverReg ceEnterCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceActiveContextTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline cePositive32BitIntegerTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCEEnterCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB' + classVariableNames: 'AltBlockCreationBytecodeSize AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass UnimplementedPrimitive YoungSelectorInPIC' - classVariableNames: 'AltBlockCreationBytecodeSize AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass YoungSelectorInPIC' poolDictionaries: 'CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 2/13/2013 15:37' 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 eventuakly teh 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 added: + ----- Method: Cogit class>>guardPageSize (in category 'accessing') ----- + guardPageSize + ^1024! Item was changed: ----- Method: Cogit class>>initializeErrorCodes (in category 'class initialization') ----- initializeErrorCodes "External errors, returned to or from cog:selector:" NotFullyInitialized := -1. InsufficientCodeSpace := -2. MethodTooBig := -4. YoungSelectorInPIC := -5. EncounteredUnknownBytecode := -6. + UnimplementedPrimitive := -7. + MaxNegativeErrorCode := UnimplementedPrimitive. - MaxNegativeErrorCode := EncounteredUnknownBytecode. "Internal errors returned by generator routines to other generator routines" BadRegisterSet := 1! Item was changed: ----- Method: Cogit>>handleWriteSimulationTrap: (in category 'simulation only') ----- handleWriteSimulationTrap: aProcessorSimulationTrap <doNotGenerate> | variableValue | + (aProcessorSimulationTrap address between: codeBase and: methodZone zoneEnd) ifTrue: - aProcessorSimulationTrap address < coInterpreter cogCodeSize ifTrue: [self error: 'attempt to write to code space']. variableValue := processor perform: aProcessorSimulationTrap registerAccessor. (simulatedVariableSetters at: aProcessorSimulationTrap address) value: variableValue. processor pc: aProcessorSimulationTrap nextpc! Item was changed: ----- Method: Cogit>>initializeCodeZoneFrom:upTo: (in category 'initialization') ----- initializeCodeZoneFrom: startAddress upTo: endAddress <api> self cCode: [self sqMakeMemoryExecutableFrom: startAddress To: endAddress] inSmalltalk: [self initializeProcessor]. + codeBase := methodZoneBase := startAddress. - codeBase := methodZoneBase := (self - cCode: [startAddress] - inSmalltalk: [startAddress + guardPageSize]). minValidCallAddress := (codeBase min: coInterpreter interpretAddress) min: coInterpreter primitiveFailAddress. self initializeBackend. self maybeGenerateCheckFeatures. self maybeGenerateICacheFlush. self generateVMOwnerLockFunctions. ceGetSP := self cCoerceSimple: self genGetLeafCallStackPointer to: #'unsigned long (*)(void)'. self generateStackPointerCapture. self generateTrampolines. + self cCode: '' inSmalltalk: [methodZone zoneEnd: endAddress]. "so that simulator works" self checkPrimitiveTableEnablers. methodZone manageFrom: methodZoneBase to: endAddress. self computeEntryOffsets. self generateClosedPICPrototype. "N.B. this is assumed to be the last thing done in initialization; see Cogit>>initialized" self generateOpenPICPrototype! 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. - guardPageSize := 1024. lastNInstructions := OrderedCollection new. "This is for testing. On many OS's the stack must remain aligned; e.g. IA32 using SSE requires 16 byte alignment." expectedSPAlignment := 0. expectedFPAlignment := 8. cStackAlignment := 16. processor class setStackAlignmentDelta: cStackAlignment. self initializeProcessorStack: coInterpreter rumpCStackAddress. objectMemory longAt: self cFramePointerAddress put: processor fp; longAt: self cStackPointerAddress put: processor sp. threadManager ifNotNil: [processor := MultiProcessor for: processor coInterpreter: coInterpreter]! Item was removed: - ----- Method: Cogit>>objectRepresentationImplementsNew: (in category 'initialization') ----- - objectRepresentationImplementsNew: primIndex - ^objectRepresentation implementsNew! Item was removed: - ----- Method: Cogit>>objectRepresentationImplementsNewMethod: (in category 'initialization') ----- - objectRepresentationImplementsNewMethod: primIndex - ^objectRepresentation implementsNewMethod! Item was removed: - ----- Method: Cogit>>objectRepresentationImplementsNewWithArg: (in category 'initialization') ----- - objectRepresentationImplementsNewWithArg: primIndex - ^objectRepresentation implementsNewWithArg! Item was added: + ----- Method: Cogit>>recordProcessing (in category 'simulation only') ----- + recordProcessing + self recordRegisters. + printRegisters ifTrue: + [processor printRegistersOn: coInterpreter transcript]. + self recordLastInstruction! Item was changed: ----- Method: Cogit>>simulateCogCodeAt: (in category 'simulation only') ----- simulateCogCodeAt: address "<Integer>" <doNotGenerate> | stackZoneBase | stackZoneBase := coInterpreter stackZoneBase. processor pc: address. [[[singleStep ifTrue: [[processor sp < stackZoneBase ifTrue: [self halt]. + self recordProcessing. - self recordRegisters. - printRegisters ifTrue: - [processor printRegistersOn: coInterpreter transcript]. - self recordLastInstruction. - printInstructions ifTrue: - [coInterpreter transcript nextPutAll: lastNInstructions last; cr. - printRegisters ifTrue: [coInterpreter transcript cr]. - coInterpreter transcript flush]. (breakPC isInteger ifTrue: [processor pc = breakPC and: [breakBlock value: self]] ifFalse: [breakBlock value: self]) ifTrue: ["printRegisters := printInstructions := true" "self reportLastNInstructions" "coInterpreter printExternalHeadFrame" "coInterpreter printFrameAndCallers: coInterpreter framePointer SP: coInterpreter stackPointer" "coInterpreter shortPrintFrameAndCallers: coInterpreter framePointer" "coInterpreter printFrame: processor fp WithSP: processor sp" "coInterpreter printFrameAndCallers: processor fp SP: processor sp" "coInterpreter shortPrintFrameAndCallers: processor fp" "self disassembleMethodFor: processor pc" coInterpreter changed: #byteCountText. self halt: 'machine code breakpoint at ', (breakPC isInteger ifTrue: [breakPC hex] ifFalse: [String streamContents: [:s| breakBlock decompile printOn: s indent: 0]])]] value]. "So that the Debugger's Over steps over all this" singleStep ifTrue: [processor singleStepIn: coInterpreter memory minimumAddress: guardPageSize + executableAndReadOnlyFrom: codeBase + to: methodZone zoneEnd] - readOnlyBelow: coInterpreter cogCodeSize] ifFalse: [processor runInMemory: coInterpreter memory minimumAddress: guardPageSize + executableAndReadOnlyFrom: codeBase + to: methodZone zoneEnd]. - readOnlyBelow: coInterpreter cogCodeSize]. ((printRegisters or: [printInstructions]) and: [clickConfirm]) ifTrue: [(self confirm: 'continue?') ifFalse: [self halt]]. true] whileTrue] on: ProcessorSimulationTrap do: [:ex| self handleSimulationTrap: ex]. true] whileTrue! Item was changed: ----- Method: Cogit>>simulateLeafCallOf: (in category 'simulation only') ----- simulateLeafCallOf: someFunction "Simulate execution of machine code that leaf-calls someFunction, answering the result returned by someFunction." <doNotGenerate> | spOnEntry | self recordRegisters. processor simulateLeafCallOf: someFunction nextpc: 16rBADF00D5 memory: coInterpreter memory. spOnEntry := processor sp. self recordInstruction: {'(simulated call of '. someFunction. ')'}. + [[processor pc between: codeBase and: methodZone zoneEnd] whileTrue: - [[processor pc between: 0 and: coInterpreter cogCodeSize] whileTrue: [singleStep + ifTrue: [self recordProcessing. - ifTrue: [self recordLastInstruction. - self recordRegisters. processor singleStepIn: coInterpreter memory minimumAddress: guardPageSize + executableAndReadOnlyFrom: codeBase + to: methodZone zoneEnd] - readOnlyBelow: coInterpreter cogCodeSize] ifFalse: [processor runInMemory: coInterpreter memory minimumAddress: guardPageSize + executableAndReadOnlyFrom: codeBase + to: methodZone zoneEnd]]] - readOnlyBelow: coInterpreter cogCodeSize]]] on: ProcessorSimulationTrap do: [:ex| | retpc | "If the ip is out of bounds the return has already occurred." + ((processor pc between: codeBase and: methodZone zoneEnd) - ((processor pc between: 0 and: coInterpreter cogCodeSize) and: [processor sp <= spOnEntry]) ifTrue: [retpc := processor leafRetpcIn: coInterpreter memory. self assert: retpc = 16rBADF00D5. self recordInstruction: {'(simulated return to '. retpc. ')'. processor simulateLeafReturnIn: coInterpreter memory}. self recordRegisters]]. ^processor cResultRegister! Item was added: + ----- Method: Cogit>>unimplementedPrimitive (in category 'accessing') ----- + unimplementedPrimitive + ^UnimplementedPrimitive! Item was added: + ----- Method: NewCoObjectMemorySimulator>>cogCodeBase (in category 'simulation only') ----- + cogCodeBase + ^0! Item was added: + ----- Method: ObjectMemory>>cheapIsInMemory: (in category 'plugin support') ----- + cheapIsInMemory: address + "Answer if the given address is in ST object memory. For simulation only." + <doNotGenerate> + ^address >= self startOfMemory + and: [address < endOfMemory]! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializePrimitiveTableForSqueakV3 (in category 'class initialization') ----- initializePrimitiveTableForSqueakV3 "Initialize the table of primitive generators. This does not include normal primitives implemened in the coInterpreter." "SimpleStackBasedCogit initializePrimitiveTableForSqueakV3" MaxCompiledPrimitiveIndex := 222. primitiveTable := CArrayAccessor on: (Array new: MaxCompiledPrimitiveIndex + 1). self table: primitiveTable from: #( "Integer Primitives (0-19)" (1 genPrimitiveAdd 1) (2 genPrimitiveSubtract 1) (3 genPrimitiveLessThan 1) (4 genPrimitiveGreaterThan 1) (5 genPrimitiveLessOrEqual 1) (6 genPrimitiveGreaterOrEqual 1) (7 genPrimitiveEqual 1) (8 genPrimitiveNotEqual 1) (9 genPrimitiveMultiply 1 processorHasMultiply:) (10 genPrimitiveDivide 1 processorHasDivQuoRem:) (11 genPrimitiveMod 1 processorHasDivQuoRem:) (12 genPrimitiveDiv 1 processorHasDivQuoRem:) (13 genPrimitiveQuo 1 processorHasDivQuoRem:) (14 genPrimitiveBitAnd 1) (15 genPrimitiveBitOr 1) (16 genPrimitiveBitXor 1) (17 genPrimitiveBitShift 1) "(18 primitiveMakePoint)" "(19 primitiveFail)" "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "(20 primitiveFail)" "(21 primitiveAddLargeIntegers)" "(22 primitiveSubtractLargeIntegers)" "(23 primitiveLessThanLargeIntegers)" "(24 primitiveGreaterThanLargeIntegers)" "(25 primitiveLessOrEqualLargeIntegers)" "(26 primitiveGreaterOrEqualLargeIntegers)" "(27 primitiveEqualLargeIntegers)" "(28 primitiveNotEqualLargeIntegers)" "(29 primitiveMultiplyLargeIntegers)" "(30 primitiveDivideLargeIntegers)" "(31 primitiveModLargeIntegers)" "(32 primitiveDivLargeIntegers)" "(33 primitiveQuoLargeIntegers)" "(34 primitiveBitAndLargeIntegers)" "(35 primitiveBitOrLargeIntegers)" "(36 primitiveBitXorLargeIntegers)" "(37 primitiveBitShiftLargeIntegers)" "Float Primitives (38-59)" "(38 primitiveFloatAt)" "(39 primitiveFloatAtPut)" (40 genPrimitiveAsFloat 0 processorHasDoublePrecisionFloatingPointSupport:) (41 genPrimitiveFloatAdd 1 processorHasDoublePrecisionFloatingPointSupport:) (42 genPrimitiveFloatSubtract 1 processorHasDoublePrecisionFloatingPointSupport:) (43 genPrimitiveFloatLessThan 1 processorHasDoublePrecisionFloatingPointSupport:) (44 genPrimitiveFloatGreaterThan 1 processorHasDoublePrecisionFloatingPointSupport:) (45 genPrimitiveFloatLessOrEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (46 genPrimitiveFloatGreaterOrEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (47 genPrimitiveFloatEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (48 genPrimitiveFloatNotEqual 1 processorHasDoublePrecisionFloatingPointSupport:) (49 genPrimitiveFloatMultiply 1 processorHasDoublePrecisionFloatingPointSupport:) (50 genPrimitiveFloatDivide 1 processorHasDoublePrecisionFloatingPointSupport:) "(51 primitiveTruncated)" "(52 primitiveFractionalPart)" "(53 primitiveExponent)" "(54 primitiveTimesTwoPower)" (55 genPrimitiveFloatSquareRoot 0 processorHasDoublePrecisionFloatingPointSupport:) "(56 primitiveSine)" "(57 primitiveArctan)" "(58 primitiveLogN)" "(59 primitiveExp)" "Subscript and Stream Primitives (60-67)" (60 genPrimitiveAt 1) "(61 primitiveAtPut)" (62 genPrimitiveSize 0) (63 genPrimitiveStringAt 1) "(64 primitiveStringAtPut)" "The stream primitives no longer pay their way; normal Smalltalk code is faster." "(65 primitiveFail)""was primitiveNext" "(66 primitiveFail)" "was primitiveNextPut" "(67 primitiveFail)" "was primitiveAtEnd" "StorageManagement Primitives (68-79)" "(68 primitiveObjectAt)" "(69 primitiveObjectAtPut)" + (70 genPrimitiveNew 0) + (71 genPrimitiveNewWithArg 1) - (70 genPrimitiveNew 0 objectRepresentationImplementsNew:) - (71 genPrimitiveNewWithArg 1 objectRepresentationImplementsNewWithArg:) "(72 primitiveArrayBecomeOneWay)" "Blue Book: primitiveBecome" "(73 primitiveInstVarAt)" "(74 primitiveInstVarAtPut)" (75 genPrimitiveIdentityHash 0) "(76 primitiveStoreStackp)" "Blue Book: primitiveAsObject" "(77 primitiveSomeInstance)" "(78 primitiveNextInstance)" + (79 genPrimitiveNewMethod 2) - (79 genPrimitiveNewMethod 2 objectRepresentationImplementsNewMethod:) "Control Primitives (80-89)" "(80 primitiveFail)" "Blue Book: primitiveBlockCopy" "(81 primitiveFail)" "Blue Book: primitiveValue" "(82 primitiveFail)" "Blue Book: primitiveValueWithArgs" "(83 primitivePerform)" "(84 primitivePerformWithArgs)" "(85 primitiveSignal)" "(86 primitiveWait)" "(87 primitiveResume)" "(88 primitiveSuspend)" "(89 primitiveFlushCache)" "Input/Output Primitives (90-109); We won't compile any of these" "System Primitives (110-119)" (110 genPrimitiveIdentical 1) (111 genPrimitiveClass) "(112 primitiveBytesLeft)" "(113 primitiveQuit)" "(114 primitiveExitToDebugger)" "(115 primitiveChangeClass)" "Blue Book: primitiveOopsLeft" "(116 primitiveFlushCacheByMethod)" "(117 primitiveExternalCall)" "(118 primitiveDoPrimitiveWithArgs)" "(119 primitiveFlushCacheSelective)" "Squeak 2.2 and earlier use 119. Squeak 2.3 and later use 116. Both are supported for backward compatibility." "Miscellaneous Primitives (120-127); We won't compile any of these" "Squeak Primitives Start Here" "Squeak Miscellaneous Primitives (128-149); We won't compile any of these" "File Primitives (150-169) - NO LONGER INDEXED; We won't compile any of these" (169 genPrimitiveNotIdentical 1) "Sound Primitives (170-199) - NO LONGER INDEXED; We won't compile any of these" "Old closure primitives" "(186 primitiveFail)" "was primitiveClosureValue" "(187 primitiveFail)" "was primitiveClosureValueWithArgs" "Perform method directly" "(188 primitiveExecuteMethodArgsArray)" "(189 primitiveExecuteMethod)" "Sound Primitives (continued) - NO LONGER INDEXED; We won't compile any of these" "(190 194 primitiveFail)" "Unwind primitives" "(195 primitiveFindNextUnwindContext)" "(196 primitiveTerminateTo)" "(197 primitiveFindHandlerContext)" (198 genFastPrimFail "primitiveMarkUnwindMethod") (199 genFastPrimFail "primitiveMarkHandlerMethod") "new closure primitives (were Networking primitives)" "(200 primitiveClosureCopyWithCopiedValues)" (201 genPrimitiveClosureValue 0) "value" (202 genPrimitiveClosureValue 1) "value:" (203 genPrimitiveClosureValue 2) "value:value:" (204 genPrimitiveClosureValue 3) "value:value:value:" (205 genPrimitiveClosureValue 4) "value:value:value:value:" "(206 genPrimitiveClosureValueWithArgs)" "valueWithArguments:" "(207 209 primitiveFail)" "reserved for Cog primitives" "(210 primitiveContextAt)" "(211 primitiveContextAtPut)" "(212 primitiveContextSize)" "(213 217 primitiveFail)" "reserved for Cog primitives" "(218 primitiveDoNamedPrimitiveWithArgs)" "(219 primitiveFail)" "reserved for Cog primitives" "(220 primitiveFail)" "reserved for Cog primitives" (221 genPrimitiveClosureValue 0) "valueNoContextSwitch" (222 genPrimitiveClosureValue 1) "valueNoContextSwitch:" "(223 229 primitiveFail)" "reserved for Cog primitives" )! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveNew (in category 'primitive generators') ----- genPrimitiveNew | r | + ((r := objectRepresentation genInnerPrimitiveNew: BytesPerWord) < 0 + and: [r ~= UnimplementedPrimitive]) ifTrue: - (r := objectRepresentation genInnerPrimitiveNew: BytesPerWord) < 0 ifTrue: [^r]. + "Call the interpreter primitive either when the machine-code primitive + fails, or if the machine-code primitive is unimplemented." ^self compileFallbackToInterpreterPrimitive! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveNewMethod (in category 'primitive generators') ----- genPrimitiveNewMethod | r | + ((r := objectRepresentation genInnerPrimitiveNewMethod: 2 * BytesPerWord) < 0 + and: [r ~= UnimplementedPrimitive]) ifTrue: - (r := objectRepresentation genInnerPrimitiveNewMethod: 2 * BytesPerWord) < 0 ifTrue: [^r]. + "Call the interpreter primitive either when the machine-code primitive + fails, or if the machine-code primitive is unimplemented." ^self compileFallbackToInterpreterPrimitive! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveNewWithArg (in category 'primitive generators') ----- genPrimitiveNewWithArg | r | + ((r := objectRepresentation genInnerPrimitiveNewWithArg: BytesPerWord) < 0 + and: [r ~= UnimplementedPrimitive]) ifTrue: - (r := objectRepresentation genInnerPrimitiveNewWithArg: BytesPerWord) < 0 ifTrue: [^r]. + "Call the interpreter primitive either when the machine-code primitive + fails, or if the machine-code primitive is unimplemented." ^self compileFallbackToInterpreterPrimitive! Item was changed: ----- Method: SmartSyntaxPluginCodeGenerator>>generateCPtrAsOop:on:indent: (in category 'translating builtins') ----- generateCPtrAsOop: aNode on: aStream indent: anInteger - aStream nextPutAll: '((sqInt)(long)('. self emitCExpression: aNode receiver on: aStream. + aStream nextPutAll: ') - BaseHeaderSize)'! - aStream nextPutAll: ') - '; - nextPutAll: ObjectMemory baseHeaderSize printString; - nextPut: $).! Item was changed: Spur32BitMemoryManager subclass: #Spur32BitCoMemoryManager instanceVariableNames: 'cogit' classVariableNames: '' poolDictionaries: 'CogMethodConstants' category: 'VMMaker-SpurMemoryManager'! + + !Spur32BitCoMemoryManager commentStamp: 'eem 11/20/2013 13:45' prior: 0! + Spur32BitCoMemoryManager is a refinement of Spur32BitMemoryManager that supports the CoInterpreter/Cogit just-in-time compiler. The signifiant difference from Spur32BitMemoryManager is the memory layout. Spur32BitCoMemoryManager adds the cgCodeZone between newSpace and the firts oldSpace segment: + + low address: + newSpace: + past/future survivor space + future/past survivor space + eden + cogCodeZone: + generated run-time + cog methods + free space + young referrers + first oldSpace segment + ... + subsequent oldSpace segment + high address: + + Instance Variables + cogit: <SimpleStackBasedCogit or subclass> + + cogit + - the just-in-time compiler + ! Item was changed: ----- Method: Spur32BitCoMemoryManager>>ceStoreCheck: (in category 'trampolines') ----- ceStoreCheck: anOop <api> "Do the store check. Answer the argument for the benefit of the code generator; ReceiverResultReg may be caller-saved and hence smashed by this call. Answering it allows the code generator to reload ReceiverResultReg cheaply." self assert: (self isNonImmediate: anOop). + self assert: (self oop: anOop isGreaterThanOrEqualTo: oldSpaceStart). - self assert: (self oop: anOop isGreaterThan: newSpaceLimit). self assert: (self isRemembered: anOop) not. scavenger remember: anOop. self setIsRememberedOf: anOop to: true. ^anOop! Item was added: + ----- Method: Spur32BitCoMemoryManager>>checkMemoryMap (in category 'debug support') ----- + checkMemoryMap + "Override to check that Cog methods are considered neither young nor old. + Being young would cause them to be scavenged. + Being old would cause them to be remembered if stored into (but wait, they don't get stored into)." + + self assert: (self isYoungObject: newSpaceStart). + self assert: (self isYoungObject: newSpaceLimit - self wordSize). + self assert: (self isOldObject: newSpaceStart) not. + self assert: (self isOldObject: newSpaceLimit - self wordSize) not. + self assert: (self isYoungObject: newSpaceLimit) not. + self assert: (self isYoungObject: oldSpaceStart) not. + self assert: (self isYoungObject: endOfMemory) not. + self assert: (self isOldObject: oldSpaceStart). + self assert: (self isOldObject: endOfMemory). + + self assert: (self isYoungObject: cogit minCogMethodAddress) not. + self assert: (self isYoungObject: cogit maxCogMethodAddress) not. + self assert: (self isOldObject: cogit minCogMethodAddress) not. + self assert: (self isOldObject: cogit maxCogMethodAddress) not! Item was removed: - ----- Method: Spur32BitCoMemoryManager>>edenBytes: (in category 'snapshot') ----- - edenBytes: bytes - newSpaceLimit := bytes + coInterpreter cogCodeSize! Item was removed: - ----- Method: Spur32BitCoMemoryManager>>newSpaceBytes (in category 'accessing') ----- - newSpaceBytes - "during snapshot load newSpaceLimit holds newSpace size + cogCodeSize temporarily." - ^newSpaceLimit - coInterpreter cogCodeSize - coInterpreter interpreterAllocationReserveBytes! Item was removed: - ----- Method: Spur32BitCoMemoryManager>>newSpaceLimitAddress (in category 'trampoline support') ----- - newSpaceLimitAddress - <api> - <returnTypeC: #usqInt> - ^self cCode: [(self addressOf: newSpaceLimit) asUnsignedInteger] - inSmalltalk: [cogit simulatedReadWriteVariableAddress: #newSpaceLimit in: self]! Item was added: + ----- Method: Spur32BitCoMemoryManager>>setHeapBase:memoryLimit:endOfMemory: (in category 'snapshot') ----- + setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd + super setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd. + oldSpaceStart := newSpaceLimit + coInterpreter cogCodeSize! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>cogCodeBase (in category 'simulation only') ----- + cogCodeBase + ^newSpaceLimit! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop "This list records the valid senders of isIntegerObject: as we replace uses of isIntegerObject: by isImmediate: where appropriate." | sel | sel := thisContext sender method selector. (#( DoIt DoItIn: on:do: "from the debugger" makeBaseFrameFor: quickFetchInteger:ofObject: frameOfMarriedContext: objCouldBeClassObj: isMarriedOrWidowedContext: shortPrint: bytecodePrimAt bytecodePrimAtPut commonAt: commonAtPut: loadFloatOrIntFrom: positive32BitValueOf: primitiveExternalCall checkedIntegerValueOf: bytecodePrimAtPut commonAtPut: primitiveVMParameter checkIsStillMarriedContext:currentFP: displayBitsOf:Left:Top:Right:Bottom: fetchStackPointerOf: primitiveContextAt primitiveContextAtPut subscript:with:storing:format: printContext: compare31or32Bits:equal: signed64BitValueOf: primDigitMultiply:negative: digitLength: isNegativeIntegerValueOf: magnitude64BitValueOf: primitiveMakePoint primitiveAsCharacter primitiveInputSemaphore baseFrameReturn primitiveExternalCall primDigitCompare: isLiveContext: numPointerSlotsOf: fileValueOf: loadBitBltDestForm fetchIntOrFloat:ofObject:ifNil: fetchIntOrFloat:ofObject: loadBitBltSourceForm loadPoint:from: primDigitAdd: primDigitSubtract: positive64BitValueOf: digitBitLogic:with:opIndex: signed32BitValueOf: isNormalized: primDigitDiv:negative: bytesOrInt:growTo: primitiveNewMethod isCogMethodReference: functionForPrimitiveExternalCall: genSpecialSelectorArithmetic genSpecialSelectorComparison ensureContextHasBytecodePC: instVar:ofContext: ceBaseFrameReturn: inlineCacheTagForInstance: primitiveObjectAtPut commonVariable:at:put:cacheIndex: primDigitBitShiftMagnitude: externalInstVar:ofContext: primitiveGrowMemoryByAtLeast primitiveFileSetPosition + cogMethodDoesntLookKosher: + shortPrintOop:) includes: sel) ifFalse: - cogMethodDoesntLookKosher:) includes: sel) ifFalse: [self halt]. ^super isIntegerObject: oop! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>setHeapBase:memoryLimit:endOfMemory: (in category 'initialization') ----- + setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd + "As invoced by CogVMSimulator>>openOn:extraBytes: baseOfHeap contains the combined + zone sizes for cog methods, stack zone, etc. The memory map in SqueakV3 looks like + 0: cogCode + stackZone + methodCache + primTraceLog + rumpCStack + heapBase: + nilObj etc + But here in Spur we want + 0: (newSpace): + past/future survivor space + past/future survivor space + eden + M: + cogCode + stackZone + methodCache + primTraceLog + rumpCStack + heapBase: + nilObj etc" + super setHeapBase: Cogit guardPageSize memoryLimit: memLimit endOfMemory: memEnd. + oldSpaceStart := newSpaceLimit + baseOfHeap. + coInterpreter heapBase: oldSpaceStart.! Item was changed: ----- Method: SpurGenerationScavenger>>copyAndForward: (in category 'scavenger') ----- copyAndForward: survivor "copyAndForward: survivor copies a survivor object either to futureSurvivorSpace or, if it is to be promoted, to oldSpace. It leaves a forwarding pointer behind. If the object is weak then corpse is threaded onto the weakList for later treatment." <inline: false> | bytesInObj newLocation hash | + self assert: ((manager isInEden: survivor) "cog methods should be excluded." + or: [manager isInPastSpace: survivor]). - self assert: survivor >= manager startOfMemory. "cog methods should be excluded." bytesInObj := manager bytesInObject: survivor. "Must remember hash before copying because threading on to the weak & ephemeron lists smashes the hash field." hash := manager rawHashBitsOf: survivor. ((self shouldBeTenured: survivor) or: [futureSurvivorStart + bytesInObj > futureSpace limit]) ifTrue: [newLocation := self copyToOldSpace: survivor. manager forwardSurvivor: survivor to: newLocation] ifFalse: [newLocation := self copyToFutureSpace: survivor bytes: bytesInObj. manager forwardSurvivor: survivor to: newLocation. "if weak or ephemeron add to the relevant lists if newLocation is young. If old, newLocation will be remembered and dealt with in the rememberedSet." (manager isWeakNonImm: newLocation) ifTrue: [self addToWeakList: survivor]. ((manager isEphemeron: newLocation) and: [(self isScavengeSurvivor: (manager keyOfEphemeron: newLocation)) not]) ifTrue: [self addToEphemeronList: survivor]]. hash ~= 0 ifTrue: [manager setHashBitsOf: newLocation to: hash]. ^newLocation! Item was changed: ----- Method: SpurGenerationScavenger>>corpseForCorpseOffset: (in category 'weakness and ephemerality') ----- corpseForCorpseOffset: corpseOffset "Use the identityHash and format fields to construct a 27 bit offset through non-future newSpace and use this to implement lists for weak array and ephemeron processing. 27 bits of 8 byte allocationUnits units is 2 ^ 30 bytes or 1Gb, big enough for newSpace for a good few years yet." + ^corpseOffset << manager shiftForAllocationUnit + manager newSpaceStart! - ^corpseOffset << manager shiftForAllocationUnit + manager startOfMemory! Item was changed: ----- Method: SpurGenerationScavenger>>corpseOffsetOf: (in category 'weakness and ephemerality') ----- corpseOffsetOf: corpse "Answer the offset of the corpse in newSpace as a multiple of allocationUnits. Use the identityHash and format fields to construct a 27 bit offset through non-future newSpace and use this to implement lists for weak array and ephemeron processing. 27 bits of 8 byte allocationUnits units is 2 ^ 30 bytes or 1Gb, big enough for newSpace for a good few years yet." + ^corpse - manager newSpaceStart >> manager shiftForAllocationUnit.! - ^corpse - manager startOfMemory >> manager shiftForAllocationUnit.! Item was removed: - ----- Method: SpurGenerationScavenger>>manager:newSpaceStart:newSpaceBytes:edenBytes: (in category 'initialization') ----- - manager: aSpurMemoryManager newSpaceStart: startAddress newSpaceBytes: totalBytes edenBytes: requestedEdenBytes self manager: aSpurMemoryManager. - self newSpaceStart: startAddress newSpaceBytes: totalBytes edenBytes: requestedEdenBytes! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator + self declareCAsOop: #( memory freeStart scavengeThreshold newSpaceStart newSpaceLimit pastSpaceStart + lowSpaceThreshold freeOldSpaceStart oldSpaceStart endOfMemory sortedFreeChunks) - self declareCAsOop: #( memory freeStart scavengeThreshold newSpaceLimit pastSpaceStart - lowSpaceThreshold freeOldSpaceStart startOfMemory endOfMemory sortedFreeChunks) in: aCCodeGenerator. self declareCAsUSqLong: (self allInstVarNames select: [:ivn| ivn endsWith: 'Usecs']) in: aCCodeGenerator. aCCodeGenerator var: #freeListsMask type: #usqInt; var: #freeLists type: #'sqInt *'; var: #classTableBitmap type: #'unsigned char *'; var: #objStackInvalidBecause type: #'char *'; var: #highestObjects type: #SpurCircularBuffer; var: #unscannedEphemerons type: #SpurContiguousObjStack. aCCodeGenerator var: #remapBuffer declareC: 'sqInt remapBuffer[RemapBufferSize + 1 /* ', (RemapBufferSize + 1) printString, ' */]'. aCCodeGenerator var: #extraRoots declareC: 'sqInt *extraRoots[ExtraRootsSize + 1 /* ', (ExtraRootsSize + 1) printString, ' */]'! Item was removed: - ----- Method: SpurMemoryManager>>addressCouldBeObjWhileScavenging: (in category 'debug support') ----- - addressCouldBeObjWhileScavenging: address - ^(address bitAnd: self baseHeaderSize - 1) = 0 - and: [(self isInOldSpace: address) - or: [(self isInEden: address) - or: [(self isInSurvivorSpace: address) - or: [scavengeInProgress and: [self isInFutureSpace: address]]]]]! Item was changed: ----- Method: SpurMemoryManager>>adjustAllOopsBy: (in category 'snapshot') ----- adjustAllOopsBy: bytesToShift "Adjust all oop references by the given number of bytes. This is done just after reading in an image when the new base address of the object heap is different from the base address in the image, or when loading multiple segments that have been coalesced. Also set bits in the classTableBitmap corresponding to used classes." | obj | self countNumClassPagesPreSwizzle: bytesToShift; ensureAdequateClassTableBitmap. (bytesToShift ~= 0 or: [segmentManager numSegments > 1]) ifTrue: [self assert: self newSpaceIsEmpty. + obj := self objectStartingAt: oldSpaceStart. - obj := self objectStartingAt: newSpaceLimit. [self oop: obj isLessThan: endOfMemory] whileTrue: [(self isFreeObject: obj) ifTrue: [self swizzleFieldsOfFreeChunk: obj] ifFalse: [self inClassTableBitmapSet: (self classIndexOf: obj). self swizzleFieldsOfObject: obj]. obj := self objectAfter: obj]] ifFalse: [self assert: self newSpaceIsEmpty. + obj := self objectStartingAt: oldSpaceStart. - obj := self objectStartingAt: newSpaceLimit. [self oop: obj isLessThan: endOfMemory] whileTrue: [(self isFreeObject: obj) ifFalse: [self inClassTableBitmapSet: (self classIndexOf: obj)]. obj := self objectAfter: obj]]! Item was changed: ----- Method: SpurMemoryManager>>allocateMemoryOfSize:newSpaceSize:stackSize:codeSize: (in category 'spur bootstrap') ----- allocateMemoryOfSize: memoryBytes newSpaceSize: newSpaceBytes stackSize: stackBytes codeSize: codeBytes "Intialize the receiver for bootsraping an image. Set up a large oldSpace and an empty newSpace and set-up freeStart and scavengeThreshold to allocate in oldSpace. Later on (in initializePostBootstrap) freeStart and scavengeThreshold will be set to sane values." <doNotGenerate> self assert: (memoryBytes \\ self allocationUnit = 0 and: [newSpaceBytes \\ self allocationUnit = 0 and: [codeBytes \\ self allocationUnit = 0]]). memory := (self endianness == #little ifTrue: [LittleEndianBitmap] ifFalse: [Bitmap]) new: (memoryBytes + newSpaceBytes + codeBytes + stackBytes) // 4. + "N.B. This layout does NOT reflect the layout of SpurCoMemoryManager" + newSpaceStart := codeBytes + stackBytes. - startOfMemory := codeBytes + stackBytes. endOfMemory := freeOldSpaceStart := memoryBytes + newSpaceBytes + codeBytes + stackBytes. "leave newSpace empty for the bootstrap" + freeStart := newSpaceBytes + newSpaceStart. + newSpaceLimit := newSpaceBytes + newSpaceStart. - freeStart := newSpaceBytes + startOfMemory. - newSpaceLimit := newSpaceBytes + startOfMemory. scavengeThreshold := memory size * 4. "Bitmap is a 4-byte per word array" + scavenger := SpurGenerationScavengerSimulator new. + scavenger manager: self. + scavenger newSpaceStart: newSpaceStart + newSpaceBytes: newSpaceBytes + edenBytes: newSpaceBytes * self scavengerDenominator + - self numSurvivorSpaces // self scavengerDenominator! - scavenger := SpurGenerationScavengerSimulator new - manager: self - newSpaceStart: startOfMemory - newSpaceBytes: newSpaceBytes - edenBytes: newSpaceBytes * self scavengerDenominator - self numSurvivorSpaces // self scavengerDenominator! Item was changed: ----- Method: SpurMemoryManager>>baseAddressOfImage (in category 'snapshot') ----- baseAddressOfImage + ^oldSpaceStart! - ^newSpaceLimit! Item was changed: ----- Method: SpurMemoryManager>>beRootIfOld: (in category 'store check') ----- beRootIfOld: oop "If this object is old, mark it as a root (because a new object may be stored into it)." <api> <inline: false> + (self isOldObject: oop) ifTrue:"No, oop is an old object" - (self isYoung: oop) ifTrue:"Yes, oop is an old object" [self possibleRootStoreInto: oop]! Item was changed: ----- Method: SpurMemoryManager>>cheapAddressCouldBeInHeap: (in category 'debug support') ----- cheapAddressCouldBeInHeap: address ^(address bitAnd: self wordSize - 1) = 0 + and: [(self oop: address isGreaterThanOrEqualTo: newSpaceStart) - and: [(self oop: address isGreaterThanOrEqualTo: startOfMemory) and: [self oop: address isLessThan: endOfMemory]]! Item was added: + ----- Method: SpurMemoryManager>>cheapIsInMemory: (in category 'plugin support') ----- + cheapIsInMemory: address + "Answer if the given address is in ST object memory. For simulation only." + <doNotGenerate> + ^(address < newSpaceLimit and: [address >= newSpaceStart]) + or: [address >= oldSpaceStart and: [address < endOfMemory]]! Item was changed: ----- Method: SpurMemoryManager>>checkHeapIntegrity: (in category 'debug support') ----- checkHeapIntegrity: excludeUnmarkedNewSpaceObjs "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects has set a bit at each object's header. Scan all objects in the heap checking that every pointer points to a header. Scan the rootTable, remapBuffer and extraRootTable checking that every entry is a pointer to a header. Check that the number of roots is correct and that all rootTable entries have their rootBit set. Answer if all checks pass." | ok numRememberedRootsInHeap | <inline: false> ok := true. numRememberedRootsInHeap := 0. self allHeapEntitiesDo: [:obj| | containsYoung fieldOop classIndex classOop | ((self isFreeObject: obj) or: [(self isYoungObject: obj) and: [(self isMarked: obj) not and: [excludeUnmarkedNewSpaceObjs]]]) ifFalse: [containsYoung := false. (self isRemembered: obj) ifTrue: [numRememberedRootsInHeap := numRememberedRootsInHeap + 1. (scavenger isInRememberedSet: obj) ifFalse: [coInterpreter print: 'remembered object '; printHex: obj; print: ' is not in remembered table'; cr. self eek. ok := false]]. (self isForwarded: obj) ifTrue: [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj. (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr. self eek. ok := false]. (self isYoung: fieldOop) ifTrue: [containsYoung := true]] ifFalse: [classOop := self classAtIndex: (classIndex := self classIndexOf: obj). ((classOop isNil or: [classOop = nilObj]) and: [(self isHiddenObj: obj) not]) ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr. self eek. ok := false]. self baseHeaderSize to: (self lastPointerOf: obj) by: BytesPerOop do: [:ptr| fieldOop := self longAt: obj + ptr. (self isNonImmediate: fieldOop) ifTrue: [| fi | fi := ptr - self baseHeaderSize / self wordSize. (fieldOop bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false]. + (self isYoung: fieldOop) ifTrue: - "don't be misled by CogMethods; they appear to be young, but they're not" - ((self isYoung: fieldOop) - and: [self oop: fieldOop isGreaterThanOrEqualTo: startOfMemory]) ifTrue: [containsYoung := true]]]]]. (containsYoung and: [(self isYoung: obj) not]) ifTrue: [(self isRemembered: obj) ifFalse: [coInterpreter print: 'unremembered object '; printHex: obj; print: ' contains young oop(s)'; cr. self eek. ok := false]]]]. numRememberedRootsInHeap ~= scavenger rememberedSetSize ifTrue: [coInterpreter print: 'root count mismatch. #heap roots '; printNum: numRememberedRootsInHeap; print: '; #roots '; printNum: scavenger rememberedSetSize; cr. self eek. "But the system copes with overflow..." self flag: 'no support for remembered set overflow yet'. "ok := rootTableOverflowed and: [needGCFlag]"]. scavenger rememberedSetWithIndexDo: [:obj :i| (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(self isYoung: obj) ifTrue: [coInterpreter print: 'non-root in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false]]]]. 1 to: remapBufferCount do: [:ri| | obj | obj := remapBuffer at: ri. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned remapRoot @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remapRoots @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false]]]. 1 to: extraRootCount do: [:ri| | obj | obj := (extraRoots at: ri) at: 0. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned extraRoot @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in extraRoots @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false]]]. ^ok! Item was added: + ----- Method: SpurMemoryManager>>checkMemoryMap (in category 'debug support') ----- + checkMemoryMap + self assert: (self isYoungObject: newSpaceStart). + self assert: (self isYoungObject: newSpaceLimit - self wordSize). + self assert: (self isOldObject: newSpaceStart) not. + self assert: (self isOldObject: newSpaceLimit - self wordSize) not. + self assert: (self isYoungObject: newSpaceLimit) not. + self assert: (self isYoungObject: oldSpaceStart) not. + self assert: (self isYoungObject: endOfMemory) not. + self assert: (self isOldObject: newSpaceLimit). + self assert: (self isOldObject: oldSpaceStart). + self assert: (self isOldObject: endOfMemory)! Item was changed: ----- Method: SpurMemoryManager>>checkOkayOop: (in category 'debug support') ----- checkOkayOop: oop "Verify that the given oop is legitimate. Check address, header, and size but not class. Answer true if OK. Otherwise print reason and answer false." <api> <var: #oop type: #usqInt> | classIndex fmt unusedBits unusedBitsInYoungObjects | <var: #unusedBits type: #usqLong> "address and size checks" (self isImmediate: oop) ifTrue: [^true]. + (self addressCouldBeObj: oop) ifFalse: - (self addressCouldBeObjWhileScavenging: oop) ifFalse: [self print: 'oop '; printHex: oop; print: ' is not a valid address'. ^false]. (self oop: (self addressAfter: oop) isLessThanOrEqualTo: endOfMemory) ifFalse: [self print: 'oop '; printHex: oop; print: ' size would make it extend beyond the end of memory'. ^false]. "header type checks" (classIndex := self classIndexOf: oop) >= self firstClassIndexPun ifFalse: [self print: 'oop '; printHex: oop; print: ' is a free chunk, or bridge, not an object'. ^false]. ((self rawNumSlotsOf: oop) = self numSlotsMask and: [(self rawNumSlotsOf: oop - self baseHeaderSize) ~= self numSlotsMask]) ifTrue: [self print: 'oop '; printHex: oop; print: ' header has overflow header word, but overflow word does not have a saturated numSlots field'. ^false]. "format check" fmt := self formatOf: oop. (fmt = 6) | (fmt = 8) ifTrue: [self print: 'oop '; printHex: oop; print: ' has an unknown format type'. ^false]. (fmt = self forwardedFormat) ~= (classIndex = self isForwardedObjectClassIndexPun) ifTrue: [self print: 'oop '; printHex: oop; print: ' has mis-matched format/classIndex fields; only one of them is the isForwarded value'. ^false]. "specific header bit checks" unusedBits := (1 << self classIndexFieldWidth) | (1 << (self identityHashFieldWidth + 32)). ((self longLongAt: oop) bitAnd: unusedBits) ~= 0 ifTrue: [self print: 'oop '; printHex: oop; print: ' has some unused header bits set; should be zero'. ^false]. unusedBitsInYoungObjects := self newSpaceRefCountMask. ((self longAt: oop) bitAnd: unusedBitsInYoungObjects) ~= 0 ifTrue: [self print: 'oop '; printHex: oop; print: ' has some header bits unused in young objects set; should be zero'. ^false]. ^true! Item was changed: ----- Method: SpurMemoryManager>>checkedLongAt: (in category 'memory access') ----- checkedLongAt: byteAddress "Assumes zero-based array indexing." <api> + (self isInMemory: byteAddress) ifFalse: - (byteAddress asUnsignedInteger < self startOfMemory - or: [byteAddress asUnsignedInteger > endOfMemory - or: [byteAddress asUnsignedInteger > newSpaceLimit - and: [(segmentManager isInSegments: byteAddress asUnsignedInteger) not]]]) ifTrue: [self warning: 'checkedLongAt bad address'. coInterpreter primitiveFail]. ^self longAt: byteAddress! Item was changed: ----- Method: SpurMemoryManager>>countNumClassPagesPreSwizzle: (in category 'class table') ----- countNumClassPagesPreSwizzle: bytesToShift "Compute the used size of the class table before swizzling. Needed to initialize the classTableBitmap which is populated during adjustAllOopsBy:" | firstObj classTableRoot nilObjPreSwizzle | + firstObj := self objectStartingAt: oldSpaceStart. "a.k.a. nilObj" - firstObj := self objectStartingAt: newSpaceLimit. "a.k.a. nilObj" "first five objects are nilObj, falseObj, trueObj, freeListsObj, classTableRootObj" classTableRoot := self objectAfter: (self objectAfter: (self objectAfter: (self objectAfter: firstObj limit: endOfMemory) limit: endOfMemory) limit: endOfMemory) limit: endOfMemory. + nilObjPreSwizzle := oldSpaceStart - bytesToShift. - nilObjPreSwizzle := newSpaceLimit - bytesToShift. numClassTablePages := self numSlotsOf: classTableRoot. self assert: numClassTablePages = (self classTableRootSlots + self hiddenRootSlots). 2 to: numClassTablePages - 1 do: [:i| (self fetchPointer: i ofObject: classTableRoot) = nilObjPreSwizzle ifTrue: [numClassTablePages := i. ^self]] ! Item was changed: + ----- Method: SpurMemoryManager>>edenBytes: (in category 'accessing') ----- - ----- Method: SpurMemoryManager>>edenBytes: (in category 'snapshot') ----- edenBytes: bytes + edenBytes := bytes! - newSpaceLimit := bytes! Item was changed: ----- Method: SpurMemoryManager>>firstAccessibleObject (in category 'object enumeration') ----- firstAccessibleObject <inline: false> + self assert: nilObj = oldSpaceStart. - self assert: nilObj = newSpaceLimit. "flush newSpace to settle the enumeration." self flushNewSpace. ^nilObj! Item was changed: ----- Method: SpurMemoryManager>>inPlaceBecome:and:copyHashFlag: (in category 'become implementation') ----- inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag "Do become in place by swapping object contents." | headerTemp temp1 temp2 o1HasYoung o2HasYoung | self assert: (self numSlotsOf: obj1) = (self numSlotsOf: obj2). "swap headers, but swapping headers swaps remembered bits; these need to be unswapped." temp1 := self isRemembered: obj1. temp2 := self isRemembered: obj2. headerTemp := self longLongAt: obj1. self longLongAt: obj1 put: (self longLongAt: obj2). self longLongAt: obj2 put: headerTemp. self setIsRememberedOf: obj1 to: temp1. self setIsRememberedOf: obj2 to: temp2. "swapping headers swaps hash; if !!copyHashFlag undo hash copy" copyHashFlag ifFalse: [temp1 := self rawHashBitsOf: obj1. self setHashBitsOf: obj1 to: (self rawHashBitsOf: obj2). self setHashBitsOf: obj2 to: temp1]. o1HasYoung := o2HasYoung := false. 0 to: (self numSlotsOf: obj1) - 1 do: [:i| temp1 := self fetchPointer: i ofObject: obj1. temp2 := self fetchPointer: i ofObject: obj2. self storePointerUnchecked: i ofObject: obj1 withValue: temp2. self storePointerUnchecked: i ofObject: obj2 withValue: temp1. (self isYoung: temp2) ifTrue: [o1HasYoung := true]. (self isYoung: temp1) ifTrue: [o2HasYoung := true]]. + (self isOldObject: obj1) ifTrue: - (self isYoungObject: obj1) ifFalse: [o1HasYoung ifTrue: [self possibleRootStoreInto: obj1]]. + (self isOldObject: obj2) ifTrue: - (self isYoungObject: obj2) ifFalse: [o2HasYoung ifTrue: [self possibleRootStoreInto: obj2]]! Item was changed: ----- Method: SpurMemoryManager>>initializeNewSpaceVariables (in category 'gc - scavenging') ----- initializeNewSpaceVariables freeStart := scavenger eden start. pastSpaceStart := scavenger pastSpace start. scavengeThreshold := scavenger eden limit - (scavenger edenBytes / 64) - coInterpreter interpreterAllocationReserveBytes. + newSpaceStart := scavenger pastSpace start min: scavenger futureSpace start. + self assert: newSpaceStart < scavenger eden start. - startOfMemory := scavenger pastSpace start min: scavenger futureSpace start. - self assert: startOfMemory < scavenger eden start. self initSpaceForAllocationCheck: (self addressOf: scavenger eden)! Item was changed: ----- Method: SpurMemoryManager>>initializeObjectMemory: (in category 'initialization') ----- initializeObjectMemory: bytesToShift "Initialize object memory variables at startup time. Assume endOfMemory is initially set (by the image-reading code) to the end of the last object in the image. Initialization redefines endOfMemory to be the end of the object allocation area based on the total available memory, but reserving some space for forwarding blocks." "Assume: image reader initializes the following variables: memory memoryLimit specialObjectsOop lastHash " <inline: false> | freeListObj | "Catch mis-initializations leading to bad translations to C" self assert: BaseHeaderSize = self baseHeaderSize. self bootstrapping ifFalse: [self initSegmentBridgeWithBytes: self bridgeSize at: endOfMemory - self bridgeSize]. segmentManager adjustSegmentSwizzlesBy: bytesToShift. "image may be at a different address; adjust oops for new location" self adjustAllOopsBy: bytesToShift. specialObjectsOop := segmentManager swizzleObj: specialObjectsOop. "heavily used special objects" nilObj := self splObj: NilObject. falseObj := self splObj: FalseObject. trueObj := self splObj: TrueObject. "In Cog we insist that nil, true & false are next to each other (Cogit generates tighter conditional branch code as a result). In addition, Spur places the free lists and class table root page immediately following them." + self assert: nilObj = oldSpaceStart. - self assert: nilObj = newSpaceLimit. self assert: falseObj = (self objectAfter: nilObj). self assert: trueObj = (self objectAfter: falseObj). freeListObj := self objectAfter: trueObj. self reInitializeClassTablePostLoad: (self objectAfter: freeListObj). markStack := self swizzleObjStackAt: MarkStackRootIndex. weaklingStack := self swizzleObjStackAt: WeaklingStackRootIndex. ephemeronQueue := self swizzleObjStackAt: EphemeronQueueRootIndex. self initializeFreeSpacePostLoad: freeListObj. segmentManager collapseSegmentsPostSwizzle. self computeFreeSpacePostSwizzle. self bootstrapping ifFalse: [self initializeNewSpaceVariables]. self initializeOldSpaceFirstFree: freeOldSpaceStart. "initializes endOfMemory, freeStart" segmentManager checkSegments. "These defaults should depend on machine size; e.g. too small on a powerful laptop, too big on a Pi." growHeadroom := 16*1024*1024. "headroom when growing" shrinkThreshold := 32*1024*1024. "free space before shrinking"! Item was changed: ----- Method: SpurMemoryManager>>isInMemory: (in category 'plugin support') ----- isInMemory: address + "Answer if the given address is in ST object memory." + ^(self isInNewSpace: address) + or: [segmentManager isInSegments: address]! - "Return true if the given address is in ST object memory" - ^(self oop: address isGreaterThanOrEqualTo: startOfMemory) - and: [(self oop: address isLessThan: newSpaceLimit) - or: [segmentManager isInSegments: address]]! Item was changed: ----- Method: SpurMemoryManager>>isInNewSpace: (in category 'object testing') ----- isInNewSpace: objOop ^(self oop: objOop isLessThan: newSpaceLimit) + and: [self oop: objOop isGreaterThanOrEqualTo: newSpaceStart]! - and: [self oop: objOop isGreaterThanOrEqualTo: startOfMemory]! Item was changed: ----- Method: SpurMemoryManager>>isInOldSpace: (in category 'object testing') ----- isInOldSpace: address ^self oop: address + isGreaterThanOrEqualTo: oldSpaceStart - isGreaterThanOrEqualTo: newSpaceLimit andLessThan: endOfMemory! Item was added: + ----- Method: SpurMemoryManager>>isInPastSpace: (in category 'object testing') ----- + isInPastSpace: address + ^self + oop: address + isGreaterThanOrEqualTo: scavenger pastSpace start + andLessThan: pastSpaceStart! Item was added: + ----- Method: SpurMemoryManager>>isOldObject: (in category 'object testing') ----- + isOldObject: objOop + <api> + "Answer if obj is old. Require that obj is non-immediate." + self assert: (self isNonImmediate: objOop). + ^self oop: objOop isGreaterThanOrEqualTo: oldSpaceStart! Item was changed: ----- Method: SpurMemoryManager>>isYoungObject: (in category 'object testing') ----- isYoungObject: objOop <api> + "Answer if obj is young. Require that obj is non-immediate." - "Answer if obj is young. Assume obj is non-immediate." self assert: (self isNonImmediate: objOop). ^self oop: objOop isLessThan: newSpaceLimit! Item was changed: ----- Method: SpurMemoryManager>>memoryBaseForImageRead (in category 'snapshot') ----- memoryBaseForImageRead "Answer the address to read the image into." + ^oldSpaceStart! - ^newSpaceLimit! Item was changed: ----- Method: SpurMemoryManager>>newSpaceBytes (in category 'accessing') ----- newSpaceBytes + ^edenBytes! - "during snapshot load newSpaceLimit holds newSpace size temporarily." - ^newSpaceLimit - coInterpreter interpreterAllocationReserveBytes! Item was changed: ----- Method: SpurMemoryManager>>newSpaceLimit (in category 'accessing') ----- newSpaceLimit + <api> - <cmacro: '() GIV(newSpaceLimit)'> ^newSpaceLimit! Item was added: + ----- Method: SpurMemoryManager>>newSpaceStart (in category 'accessing') ----- + newSpaceStart + ^newSpaceStart! Item was changed: ----- Method: SpurMemoryManager>>okayOop: (in category 'debug support') ----- okayOop: signedOop "Verify that the given oop is legitimate. Check address, header, and size but not class." | oop classIndex fmt unusedBits unusedBitsInYoungObjects | <var: #oop type: #usqInt> <var: #unusedBits type: #usqLong> oop := self cCoerce: signedOop to: #usqInt. "address and size checks" (self isImmediate: oop) ifTrue: [^true]. + (self addressCouldBeObj: oop) ifFalse: - (self addressCouldBeObjWhileScavenging: oop) ifFalse: [self error: 'oop is not a valid address'. ^false]. (self oop: (self addressAfter: oop) isLessThanOrEqualTo: endOfMemory) ifFalse: [self error: 'oop size would make it extend beyond the end of memory'. ^false]. "header type checks" (classIndex := self classIndexOf: oop) >= self firstClassIndexPun ifFalse: [self error: 'oop is a free chunk, or bridge, not an object'. ^false]. ((self rawNumSlotsOf: oop) = self numSlotsMask and: [(self rawNumSlotsOf: oop - self baseHeaderSize) ~= self numSlotsMask]) ifTrue: [self error: 'oop header has overflow header word, but overflow word does not have a saturated numSlots field'. ^false]. "format check" fmt := self formatOf: oop. (fmt = 6) | (fmt = 8) ifTrue: [self error: 'oop has an unknown format type'. ^false]. (fmt = self forwardedFormat) ~= (classIndex = self isForwardedObjectClassIndexPun) ifTrue: [self error: 'oop has mis-matched format/classIndex fields; only one of them is the isForwarded value'. ^false]. "specific header bit checks" unusedBits := (1 << self classIndexFieldWidth) | (1 << (self identityHashFieldWidth + 32)). ((self longLongAt: oop) bitAnd: unusedBits) ~= 0 ifTrue: [self error: 'some unused header bits are set; should be zero'. ^false]. unusedBitsInYoungObjects := (1 << self greyBitShift) | (1 << self pinnedBitShift) | (1 << self rememberedBitShift). ((self longAt: oop) bitAnd: unusedBitsInYoungObjects) ~= 0 ifTrue: [self error: 'some header bits unused in young objects are set; should be zero'. ^false]. ^true ! Item was added: + ----- Method: SpurMemoryManager>>oldSpaceStart (in category 'accessing') ----- + oldSpaceStart + ^oldSpaceStart! Item was changed: ----- Method: SpurMemoryManager>>reverseBytesInMemory (in category 'snapshot') ----- reverseBytesInMemory + self reverseBytesFrom: oldSpaceStart to: endOfMemory! - self reverseBytesFrom: newSpaceLimit to: endOfMemory! Item was changed: ----- Method: SpurMemoryManager>>scavengingGCTenuringIf: (in category 'gc - scavenging') ----- scavengingGCTenuringIf: tenuringCriterion "Run the scavenger." self assert: remapBufferCount = 0. self assert: scavenger eden limit - freeStart > coInterpreter interpreterAllocationReserveBytes. + self checkMemoryMap. self checkFreeSpace. "coInterpreter printCallStackFP: coInterpreter framePointer" self runLeakCheckerForFullGC: false. coInterpreter preGCAction: GCModeScavenge; "would prefer this to be in mapInterpreterOops, but compatibility with ObjectMemory dictates it goes here." + flushMethodCacheFrom: newSpaceStart to: newSpaceLimit. - flushMethodCacheFrom: startOfMemory to: newSpaceLimit. needGCFlag := false. gcStartUsecs := coInterpreter ioUTCMicrosecondsNow. self doScavenge: tenuringCriterion. statScavenges := statScavenges + 1. statGCEndUsecs := coInterpreter ioUTCMicrosecondsNow. statSGCDeltaUsecs := statGCEndUsecs - gcStartUsecs. statScavengeGCUsecs := statScavengeGCUsecs + statSGCDeltaUsecs. statRootTableCount := scavenger rememberedSetSize. coInterpreter postGCAction: GCModeScavenge. self runLeakCheckerForFullGC: false. self checkFreeSpace! Item was changed: ----- Method: SpurMemoryManager>>setHeapBase:memoryLimit:endOfMemory: (in category 'snapshot') ----- setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd "Transcript cr; nextPutAll: 'heapBase: '; print: baseOfHeap; nextPut: $/; nextPutAll: baseOfHeap hex; nextPutAll: ' memLimit '; print: memLimit; nextPut: $/; nextPutAll: memLimit hex; nextPutAll: ' memEnd '; print: memEnd; nextPut: $/; nextPutAll: memEnd hex; cr; flush." + "This is a little counter-intuitive. Eden must include interpreterAllocationReserveBytes." + newSpaceStart := baseOfHeap. - startOfMemory := baseOfHeap. newSpaceLimit := baseOfHeap + self newSpaceBytes + coInterpreter interpreterAllocationReserveBytes. - freeOldSpaceStart := memEnd. - endOfMemory := memLimit. scavenger + newSpaceStart: newSpaceStart + newSpaceBytes: newSpaceLimit - newSpaceStart + edenBytes: newSpaceLimit - newSpaceStart - newSpaceStart: baseOfHeap - newSpaceBytes: newSpaceLimit - baseOfHeap - edenBytes: newSpaceLimit - baseOfHeap * (self scavengerDenominator - self numSurvivorSpaces) // self scavengerDenominator. freeStart := scavenger eden start. + pastSpaceStart := scavenger pastSpace start. + + freeOldSpaceStart := memEnd. + endOfMemory := memLimit. + oldSpaceStart := newSpaceLimit! - pastSpaceStart := scavenger pastSpace start! Item was removed: - ----- Method: SpurMemoryManager>>startOfMemory: (in category 'simulation') ----- - startOfMemory: value - startOfMemory := value. - (freeStart isNil or: [self oop: freeStart isLessThan: value]) ifTrue: - [freeStart := value]! Item was changed: ----- Method: SpurMemoryManager>>storePointer:ofForwarder:withValue: (in category 'heap management') ----- storePointer: fieldIndex ofForwarder: objOop withValue: valuePointer self assert: (self isForwarded: objOop). self assert: (self isOopForwarded: valuePointer) not. + (self isOldObject: objOop) ifTrue: "most stores into young objects" + [(self isYoung: valuePointer) ifTrue: - (self isYoungObject: objOop) ifFalse: "most stores into young objects" - [((self isNonImmediate: valuePointer) and: [self isYoung: valuePointer]) ifTrue: [self possibleRootStoreInto: objOop]]. ^self longAt: objOop + self baseHeaderSize + (fieldIndex << self shiftForWord) put: valuePointer! Item was changed: ----- Method: SpurMemoryManager>>storePointer:ofObject:withValue: (in category 'object access') ----- storePointer: fieldIndex ofObject: objOop withValue: valuePointer "Note must check here for stores of young objects into old ones." self assert: (self isForwarded: objOop) not. + (self isOldObject: objOop) ifTrue: "most stores into young objects" + [(self isYoung: valuePointer) ifTrue: + [self possibleRootStoreInto: objOop]]. - (self isYoungObject: objOop) ifFalse: "most stores into young objects" - [(self isImmediate: valuePointer) ifFalse: - [(self isYoung: valuePointer) ifTrue: - [self possibleRootStoreInto: objOop]]]. ^self longAt: objOop + self baseHeaderSize + (fieldIndex << self shiftForWord) put: valuePointer! Item was changed: ----- Method: SpurSegmentManager>>collapseSegmentsPostSwizzle (in category 'snapshot') ----- collapseSegmentsPostSwizzle "The image has been loaded, old segments reconstructed, and the heap swizzled into a single contiguous segment. Collapse the segments into one." <inline: false> canSwizzle := false. self cCode: [] inSmalltalk: [segments ifNil: [self allocateOrExtendSegmentInfos]]. numSegments := 1. (segments at: 0) + segStart: manager oldSpaceStart; + segSize: manager endOfMemory - manager oldSpaceStart. - segStart: manager newSpaceLimit; - segSize: manager endOfMemory - manager newSpaceLimit. manager bootstrapping ifTrue: ["finally plant a bridge at the end of the coalesced segment and cut back the manager's notion of the end of memory to immediately before the bridge." self assert: manager endOfMemory = (segments at: 0) segLimit. manager initSegmentBridgeWithBytes: manager bridgeSize at: manager endOfMemory - manager bridgeSize]. self assert: (self isValidSegmentBridge: manager endOfMemory - manager baseHeaderSize). self assert: (manager numSlotsOfAny: manager endOfMemory - manager baseHeaderSize) = 0! Item was changed: ----- Method: SpurSegmentManager>>readHeapFromImageFile:dataBytes: (in category 'snapshot') ----- readHeapFromImageFile: f dataBytes: numBytes "Read numBytes of image data from f into memory at memoryBaseForImageRead. Answer the number of bytes written. In addition, read each segment, build up the segment info, while eliminating the bridge objects that end each segment and give the size of the subsequent segment." <var: #f type: #sqImageFile> <inline: false> | bytesRead totalBytesRead bridge nextSegmentSize oldBase newBase segInfo bridgeSpan | <var: 'segInfo' type: 'SpurSegmentInfo *'> self allocateOrExtendSegmentInfos. "segment sizes include the two-header-word bridge at the end of each segment." numSegments := totalBytesRead := 0. oldBase := 0. "N.B. still must be adjusted by oldBaseAddr." + newBase := manager oldSpaceStart. - newBase := manager newSpaceLimit. nextSegmentSize := firstSegmentSize. + bridge := firstSegmentSize + manager oldSpaceStart - manager baseHeaderSize. - bridge := firstSegmentSize + manager newSpaceLimit - manager baseHeaderSize. [segInfo := self addressOf: (segments at: numSegments). segInfo segStart: oldBase; "N.B. still must be adjusted by oldBaseAddr." segSize: nextSegmentSize; swizzle: newBase - oldBase. "N.B. still must be adjusted by oldBaseAddr." bytesRead := self readHeapFrom: f at: newBase dataBytes: nextSegmentSize. bytesRead > 0 ifTrue: [totalBytesRead := totalBytesRead + bytesRead]. bytesRead ~= nextSegmentSize ifTrue: [^totalBytesRead]. numSegments := numSegments + 1. bridgeSpan := manager bytesPerSlot * (manager rawOverflowSlotsOf: bridge). oldBase := oldBase + nextSegmentSize + bridgeSpan. newBase := newBase + nextSegmentSize - manager bridgeSize. nextSegmentSize := manager longLongAt: bridge. nextSegmentSize ~= 0] whileTrue: [bridge := bridge - manager bridgeSize + nextSegmentSize]. "newBase should point just past the last bridge. all others should have been eliminated." + self assert: newBase - manager oldSpaceStart - self assert: newBase - manager newSpaceLimit = (totalBytesRead - (numSegments * manager bridgeSize)). "set freeOldSpaceStart now for adjustAllOopsBy:" manager setFreeOldSpaceStart: newBase. ^totalBytesRead! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveNew (in category 'primitive generators') ----- genPrimitiveNew | r | + ((r := objectRepresentation genInnerPrimitiveNew: 0) < 0 + and: [r ~= UnimplementedPrimitive]) ifTrue: - (r := objectRepresentation genInnerPrimitiveNew: 0) < 0 ifTrue: [^r]. + "Call the interpreter primitive either when the machine-code primitive + fails, or if the machine-code primitive is unimplemented." ^self compileFallbackToInterpreterPrimitive! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveNewWithArg (in category 'primitive generators') ----- genPrimitiveNewWithArg | r | + ((r := objectRepresentation genInnerPrimitiveNewWithArg: 0) < 0 + and: [r ~= UnimplementedPrimitive]) ifTrue: - (r := objectRepresentation genInnerPrimitiveNewWithArg: 0) < 0 ifTrue: [^r]. + "Call the interpreter primitive either when the machine-code primitive + fails, or if the machine-code primitive is unimplemented." ^self compileFallbackToInterpreterPrimitive! Item was changed: ----- Method: TMethod>>inferTypesForImplicitlyTypedVariablesIn: (in category 'type inference') ----- inferTypesForImplicitlyTypedVariablesIn: aCodeGen + | explicitlyTyped | + explicitlyTyped := declarations keys asSet. parseTree nodesDo: [:node| | type var m | "If there is something of the form i >= 0, then i should be signed, not unsigned." (node isSend and: [(locals includes: (var := node receiver variableNameOrNil)) + and: [(explicitlyTyped includes: var) not and: [(#(<= < >= >) includes: node selector) and: [node args first isConstant and: [node args first value = 0 and: [(type := self typeFor: var in: aCodeGen) notNil + and: [type first == $u]]]]]]]) ifTrue: - and: [type first == $u]]]]]]) ifTrue: [declarations at: var put: (declarations at: var) allButFirst]. "if an assignment of a known send, set the variable's type to the return type of the send." (node isAssignment and: [(locals includes: (var := node variable name)) and: [(declarations includesKey: var) not and: [node expression isSend and: [(m := aCodeGen methodNamed: node expression selector) notNil]]]]) ifTrue: [(#(sqInt void nil) includes: m returnType) ifFalse: ["the $: is to map things like unsigned field : 3 to usqInt" declarations at: var put: ((m returnType includes: $:) ifTrue: [#usqInt] ifFalse: [m returnType]), ' ', var]]]! Item was added: + ----- Method: VMBasicConstants class>>mostBasicConstantNames (in category 'accessing') ----- + mostBasicConstantNames + ^#(BaseHeaderSize BytesPerWord BytesPerOop)! Item was changed: ----- Method: VMClass class>>writeVMHeaderTo:bytesPerWord: (in category 'translation') ----- writeVMHeaderTo: aStream bytesPerWord: bytesPerWord "Generate the contents of interp.h on aStream. Specific Interpreter subclasses override to add more stuff." aStream nextPutAll: '#define VM_PROXY_MAJOR '; print: self vmProxyMajorVersion; cr; nextPutAll: '#define VM_PROXY_MINOR '; print: self vmProxyMinorVersion; cr; cr; nextPutAll: '#define SQ_VI_BYTES_PER_WORD '; print: bytesPerWord; cr; cr. + + "The most basic constants must be defined here, not in e.g. the plugin sources, so allow those + other sources to be shared between different builds (Spur vs SqueakV3, 32-bit vs 64-bit, etc)" + VMBasicConstants mostBasicConstantNames do: + [:const| + aStream nextPutAll: '#define '; nextPutAll: const; space; print: (VMBasicConstants classPool at: const); cr]. + aStream cr. + ((VMBasicConstants classPool associations select: [:a| a key beginsWith: 'PrimErr']) asSortedCollection: [:a1 :a2| a1 value <= a2 value]) do: [:a| aStream nextPutAll: '#define '; nextPutAll: a key; space; print: a value; cr]. aStream cr!

1 0

VM Maker: Cog-eem.122.mcz
by commits＠source.squeak.org 23 Nov '13

23 Nov '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.122.mcz ==================== Summary ==================== Name: Cog-eem.122 Author: eem Time: 22 November 2013, 2:59:51.351 pm UUID: 1ca89f5f-0258-44b3-b7c0-acb52206aaf2 Ancestors: Cog-eem.121 Add new run/single-step primitives to the processor aliens that allow for the read-only/executable range to be origined above zero, so that Spur can place the code zone between newSpace and oldSpace and hence avoid two range checks when scavenging. (If the codeZone is below newSpace then copyAndForward: must check for both <= newSpaceLimit and >= newSpaceStart). Simplify the error-handling routines; they don't use minimumWritableAddress so it can be nuked. Add some hex output to ProcessorSimulationTrap printing. =============== Diff against Cog-eem.121 =============== Item was changed: ----- Method: BochsIA32Alien class>>initialize (in category 'class initialization') ----- initialize "BochsIA32Alien initialize" PostBuildStackDelta := 0. + OpcodeExceptionMap := Array new: 256 withAll: #handleExecutionPrimitiveFailureAt:in:. - OpcodeExceptionMap := Array new: 256 withAll: #handleExecutionPrimitiveFailureAt:in:readOnlyBelow:. OpcodeExceptionMap + at: 1 + self basicNew callOpcode put: #handleCallFailureAt:in:; + at: 1 + self basicNew jmpOpcode put: #handleJmpFailureAt:in:; + at: 1 + self basicNew retOpcode put: #handleRetFailureAt:in:; + at: 1 + self basicNew movALObOpcode put: #handleMovALObFailureAt:in:; + at: 1 + self basicNew movObALOpcode put: #handleMovObALFailureAt:in:; + at: 1 + self basicNew movGvEvOpcode put: #handleMovGvEvFailureAt:in:; + at: 1 + self basicNew movEvGvOpcode put: #handleMovEvGvFailureAt:in:; + at: 1 + self basicNew movGbEbOpcode put: #handleMovGbEbFailureAt:in:; + at: 1 + self basicNew movEbGbOpcode put: #handleMovEbGbFailureAt:in:! - at: 1 + self basicNew callOpcode put: #handleCallFailureAt:in:readOnlyBelow:; - at: 1 + self basicNew jmpOpcode put: #handleJmpFailureAt:in:readOnlyBelow:; - at: 1 + self basicNew retOpcode put: #handleRetFailureAt:in:readOnlyBelow:; - at: 1 + self basicNew movALObOpcode put: #handleMovALObFailureAt:in:readOnlyBelow:; - at: 1 + self basicNew movObALOpcode put: #handleMovObALFailureAt:in:readOnlyBelow:; - at: 1 + self basicNew movGvEvOpcode put: #handleMovGvEvFailureAt:in:readOnlyBelow:; - at: 1 + self basicNew movEvGvOpcode put: #handleMovEvGvFailureAt:in:readOnlyBelow:; - at: 1 + self basicNew movGbEbOpcode put: #handleMovGbEbFailureAt:in:readOnlyBelow:; - at: 1 + self basicNew movEbGbOpcode put: #handleMovEbGbFailureAt:in:readOnlyBelow:! Item was added: + ----- Method: BochsIA32Alien>>handleCallFailureAt:in: (in category 'error handling') ----- + handleCallFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a call into a ProcessorSimulationTrap signal." + | relativeJump | + relativeJump := memoryArray longAt: pc + 2 bigEndian: false. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 5 + address: (pc + 5 + relativeJump) signedIntToLong + type: #call) + signal! Item was removed: - ----- Method: BochsIA32Alien>>handleCallFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleCallFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a call into a ProcessorSimulationTrap signal." - | relativeJump | - relativeJump := memoryArray longAt: pc + 2 bigEndian: false. - ^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 5 - address: (pc + 5 + relativeJump) signedIntToLong - type: #call) - signal! Item was added: + ----- Method: BochsIA32Alien>>handleExecutionPrimitiveFailureAt:in: (in category 'error handling') ----- + handleExecutionPrimitiveFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Handle an execution primitive failure for an unhandled opcode." + ^self reportPrimitiveFailure! Item was removed: - ----- Method: BochsIA32Alien>>handleExecutionPrimitiveFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleExecutionPrimitiveFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Handle an execution primitive failure for an unhandled opcode." - ^self reportPrimitiveFailure! Item was added: + ----- Method: BochsIA32Alien>>handleExecutionPrimitiveFailureIn:minimumAddress: (in category 'error handling') ----- + handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress + "Handle an execution primitive failure. Convert out-of-range call and absolute + memory read into register instructions into ProcessorSimulationTrap signals." + "self printIntegerRegistersOn: Transcript" + "self printRegistersOn: Transcript" + | pc opcode | + ((pc := self eip) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: + [opcode := memoryArray byteAt: pc + 1. + ^self + perform: (OpcodeExceptionMap at: opcode + 1) + with: pc + with: memoryArray]. + ^self reportPrimitiveFailure! Item was removed: - ----- Method: BochsIA32Alien>>handleExecutionPrimitiveFailureIn:minimumAddress:readOnlyBelow: (in category 'error handling') ----- - handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Handle an execution primitive failure. Convert out-of-range call and absolute - memory read into register instructions into ProcessorSimulationTrap signals." - "self printIntegerRegistersOn: Transcript" - "self printRegistersOn: Transcript" - | pc opcode | - ((pc := self eip) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: - [opcode := memoryArray byteAt: pc + 1. - ^self - perform: (OpcodeExceptionMap at: opcode + 1) - with: pc - with: memoryArray - with: minimumWritableAddress]. - ^self reportPrimitiveFailure! Item was added: + ----- Method: BochsIA32Alien>>handleJmpFailureAt:in: (in category 'error handling') ----- + handleJmpFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a jmp into a ProcessorSimulationTrap signal." + | relativeJump | + relativeJump := memoryArray longAt: pc + 2 bigEndian: false. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 5 + address: (pc + 5 + relativeJump) signedIntToLong + type: #jump) + signal! Item was removed: - ----- Method: BochsIA32Alien>>handleJmpFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleJmpFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a jmp into a ProcessorSimulationTrap signal." - | relativeJump | - relativeJump := memoryArray longAt: pc + 2 bigEndian: false. - ^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 5 - address: (pc + 5 + relativeJump) signedIntToLong - type: #jump) - signal! Item was added: + ----- Method: BochsIA32Alien>>handleMovALObFailureAt:in: (in category 'error handling') ----- + handleMovALObFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a read into eax into a ProcessorSimulationTrap signal." + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 5 + address: (memoryArray unsignedLongAt: pc + 2 bigEndian: false) + type: #read + accessor: #eax:) + signal! Item was removed: - ----- Method: BochsIA32Alien>>handleMovALObFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMovALObFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a read into eax into a ProcessorSimulationTrap signal." - ^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 5 - address: (memoryArray unsignedLongAt: pc + 2 bigEndian: false) - type: #read - accessor: #eax:) - signal! Item was added: + ----- Method: BochsIA32Alien>>handleMovEbGbFailureAt:in: (in category 'error handling') ----- + handleMovEbGbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." + | modrmByte | + ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" + ifTrue: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 6 + address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) + + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) + bitAnd: 16rFFFFFFFF) + type: #write + accessor: (#(al cl dl bl ah ch dh bh) at: ((modrmByte >> 3 bitAnd: 7) + 1))) + signal] + ifFalse: + [self reportPrimitiveFailure]! Item was removed: - ----- Method: BochsIA32Alien>>handleMovEbGbFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMovEbGbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." - | modrmByte | - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - bitAnd: 16rFFFFFFFF) - type: #write - accessor: (#(al cl dl bl ah ch dh bh) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was added: + ----- Method: BochsIA32Alien>>handleMovEvGvFailureAt:in: (in category 'error handling') ----- + handleMovEvGvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a register write into a ProcessorSimulationTrap signal." + | modrmByte | + ^((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC7) = 16r5 "ModRegInd & disp32" + ifTrue: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 6 + address: (memoryArray unsignedLongAt: pc + 3 bigEndian: false) + type: #write + accessor: (#(eax ecx edx ebx esp ebp esi edi) at: ((modrmByte >> 3 bitAnd: 7) + 1))) + signal] + ifFalse: + [self reportPrimitiveFailure]! Item was removed: - ----- Method: BochsIA32Alien>>handleMovEvGvFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMovEvGvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a register write into a ProcessorSimulationTrap signal." - | modrmByte | - ^((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC7) = 16r5 "ModRegInd & disp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - type: #write - accessor: (#(eax ecx edx ebx esp ebp esi edi) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was added: + ----- Method: BochsIA32Alien>>handleMovGbEbFailureAt:in: (in category 'error handling') ----- + handleMovGbEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." + | modrmByte | + ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" + ifTrue: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 6 + address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) + + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) + bitAnd: 16rFFFFFFFF) + type: #read + accessor: (#(al: cl: dl: bl: ah: ch: dh: bh:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) + signal] + ifFalse: + [self reportPrimitiveFailure]! Item was removed: - ----- Method: BochsIA32Alien>>handleMovGbEbFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMovGbEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." - | modrmByte | - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - bitAnd: 16rFFFFFFFF) - type: #read - accessor: (#(al: cl: dl: bl: ah: ch: dh: bh:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was added: + ----- Method: BochsIA32Alien>>handleMovGvEvFailureAt:in: (in category 'error handling') ----- + handleMovGvEvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." + | modrmByte | + ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC7) = 16r5) "ModRegInd & disp32" + ifTrue: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 6 + address: (memoryArray unsignedLongAt: pc + 3 bigEndian: false) + type: #read + accessor: (#(eax: ecx: edx: ebx: esp: ebp: esi: edi:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) + signal] + ifFalse: + [self reportPrimitiveFailure]! Item was removed: - ----- Method: BochsIA32Alien>>handleMovGvEvFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMovGvEvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a register load into a ProcessorSimulationTrap signal." - | modrmByte | - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC7) = 16r5) "ModRegInd & disp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - type: #read - accessor: (#(eax: ecx: edx: ebx: esp: ebp: esi: edi:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was added: + ----- Method: BochsIA32Alien>>handleMovObALFailureAt:in: (in category 'error handling') ----- + handleMovObALFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a write of eax into a ProcessorSimulationTrap signal." + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 5 + address: (memoryArray unsignedLongAt: pc + 2 bigEndian: false) + type: #write + accessor: #eax) + signal! Item was removed: - ----- Method: BochsIA32Alien>>handleMovObALFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMovObALFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a write of eax into a ProcessorSimulationTrap signal." - ^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 5 - address: (memoryArray unsignedLongAt: pc + 2 bigEndian: false) - type: #write - accessor: #eax) - signal! Item was added: + ----- Method: BochsIA32Alien>>handleRetFailureAt:in: (in category 'error handling') ----- + handleRetFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a ret into a ProcessorSimulationTrap signal." + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 1 + address: (memoryArray unsignedLongAt: self esp + 1) + type: #return + accessor: #eip:) + signal! Item was removed: - ----- Method: BochsIA32Alien>>handleRetFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleRetFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a ret into a ProcessorSimulationTrap signal." - ^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 1 - address: (memoryArray unsignedLongAt: self esp + 1) - type: #return - accessor: #eip:) - signal! Item was added: + ----- Method: BochsIA32Alien>>primitiveRunInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- + primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" + minimumAddress: minimumAddress "<Integer>" + executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" + to: maxExecAndReadOnlyAddress "<Integer>" + "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the + memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." + <primitive: 'primitiveRunInMemoryMinimumAddressERFromTo' module: 'BochsIA32Plugin' error: ec> + ^ec == #'inappropriate operation' + ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] + ifFalse: [self reportPrimitiveFailure] + + "self printRegistersOn: Transcript"! Item was changed: ----- Method: BochsIA32Alien>>primitiveRunInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" maximumAddress: maximimAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range calls, jumps and memory read/writes into ProcessorSimulationTrap signals." <primitive: 'primitiveRunInMemoryMinAddressMaxAddressReadWrite' module: 'BochsIA32Plugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] - minimumAddress: minimumAddress - readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure] "self printRegistersOn: Transcript"! Item was changed: ----- Method: BochsIA32Alien>>primitiveRunInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range calls, jumps and memory read/writes into ProcessorSimulationTrap signals." <primitive: 'primitiveRunInMemoryMinimumAddressReadWrite' module: 'BochsIA32Plugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] - minimumAddress: minimumAddress - readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure] "self printRegistersOn: Transcript"! Item was added: + ----- Method: BochsIA32Alien>>primitiveSingleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- + primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" + minimumAddress: minimumAddress "<Integer>" + executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" + to: maxExecAndReadOnlyAddress "<Integer>" + "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the + memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." + <primitive: 'primitiveSingleStepInMemoryMinimumAddressERFromTo' module: 'BochsIA32Plugin' error: ec> + ^ec == #'inappropriate operation' + ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] + ifFalse: [self reportPrimitiveFailure] + + "self printRegistersOn: Transcript"! Item was changed: ----- Method: BochsIA32Alien>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" maximumAddress: maximimAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range calls, jumps and memory read/writes into ProcessorSimulationTrap signals." <primitive: 'primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite' module: 'BochsIA32Plugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] - minimumAddress: minimumAddress - readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure]! Item was changed: ----- Method: BochsIA32Alien>>primitiveSingleStepInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range calls, jumps and memory read/writes into ProcessorSimulationTrap signals." <primitive: 'primitiveSingleStepInMemoryMinimumAddressReadWrite' module: 'BochsIA32Plugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] - minimumAddress: minimumAddress - readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure]! Item was added: + ----- Method: BochsIA32Plugin>>primitiveRunInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- + "cpuAlien <BochsIA32Alien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" to: maxExecAndReadOnlyAddress "<Integer>" + "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." + | cpuAlien cpu maybeErr | + <var: #cpu type: #'void *'> + cpuAlien := self primitive: #primitiveRunInMemoryMinimumAddressERFromTo + parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) + receiver: #Oop. + (cpu := self startOfData: cpuAlien) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. + prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: + [prevInterruptCheckChain = 0]. + maybeErr := self runCPU: cpu + In: memory + Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) + MinAddress: minAddress + EROFrom: minExecAndReadOnlyAddress + To: maxExecAndReadOnlyAddress. + interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. + maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. + ^cpuAlien! Item was added: + ----- Method: BochsIA32Plugin>>primitiveSingleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- + "cpuAlien <BochsIA32Alien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" to: maxExecAndReadOnlyAddress "<Integer>" + "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." + | cpuAlien cpu maybeErr | + <var: #cpu type: #'void *'> + cpuAlien := self primitive: #primitiveSingleStepInMemoryMinimumAddressERFromTo + parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) + receiver: #Oop. + (cpu := self startOfData: cpuAlien) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + maybeErr := self singleStepCPU: cpu + In: memory + Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) + MinAddress: minAddress + EROFrom: minExecAndReadOnlyAddress + To: maxExecAndReadOnlyAddress. + interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. + maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. + ^cpuAlien! Item was added: + ----- Method: CogProcessorAlien>>runInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'execution') ----- + runInMemory: aMemory minimumAddress: minimumAddress executableAndReadOnlyFrom: minExecAndReadOnlyAddress to: maxExecAndReadOnlyAddress + | result | + result := self primitiveRunInMemory: aMemory + minimumAddress: minimumAddress + executableAndReadOnlyFrom: minExecAndReadOnlyAddress + to: maxExecAndReadOnlyAddress. + result ~~ self ifTrue: + [self error: 'eek!!']! Item was added: + ----- Method: CogProcessorAlien>>singleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'execution') ----- + singleStepInMemory: aMemory minimumAddress: minimumAddress executableAndReadOnlyFrom: minExecAndReadOnlyAddress to: maxExecAndReadOnlyAddress + | result | + result := self primitiveSingleStepInMemory: aMemory + minimumAddress: minimumAddress + executableAndReadOnlyFrom: minExecAndReadOnlyAddress + to: maxExecAndReadOnlyAddress. + result ~~ self ifTrue: + [self error: 'eek!!']! Item was added: + ----- Method: GdbARMAlien>>handleCallFailureAt:in: (in category 'error handling') ----- + handleCallFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a call into a ProcessorSimulationTrap signal." + | relativeJump callAddress | + ((memoryArray byteAt: pc + 4) bitAnd: 16rF) = 16rB "BL opcode" + ifTrue: ["short jump via BL, therefore we have a 24bit signed integer offset" + relativeJump := (memoryArray unsignedLongAt: pc + 1 bigEndian: false) bitAnd: 16r00FFFFFF. + relativeJump := (relativeJump bitAt: 24) = 1 + ifTrue: [((relativeJump bitOr: 16r3F000000) << 2) signedIntFromLong] + ifFalse: [relativeJump << 2]. + callAddress := (pc + 8 + relativeJump)] + + ifFalse: ["long jump using RISCTempReg" + "The memoryArray starts indexing from 1, whereas the pc is based on 0-indexing, therefore all access-offsets are one greater than expected" + callAddress := (memoryArray byteAt: pc + 4) + + ((memoryArray byteAt: pc - 4) << 24) + + ((memoryArray byteAt: pc - 8) << 16) + + ((memoryArray byteAt: pc - 12) << 8)]. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: callAddress signedIntToLong + type: #call) + signal! Item was removed: - ----- Method: GdbARMAlien>>handleCallFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleCallFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a call into a ProcessorSimulationTrap signal." - | relativeJump callAddress | - ((memoryArray byteAt: pc + 4) bitAnd: 16rF) = 16rB "BL opcode" - ifTrue: ["short jump via BL, therefore we have a 24bit signed integer offset" - relativeJump := (memoryArray unsignedLongAt: pc + 1 bigEndian: false) bitAnd: 16r00FFFFFF. - relativeJump := (relativeJump bitAt: 24) = 1 - ifTrue: [((relativeJump bitOr: 16r3F000000) << 2) signedIntFromLong] - ifFalse: [relativeJump << 2]. - callAddress := (pc + 8 + relativeJump)] - - ifFalse: ["long jump using RISCTempReg" - "The memoryArray starts indexing from 1, whereas the pc is based on 0-indexing, therefore all access-offsets are one greater than expected" - callAddress := (memoryArray byteAt: pc + 4) - + ((memoryArray byteAt: pc - 4) << 24) - + ((memoryArray byteAt: pc - 8) << 16) - + ((memoryArray byteAt: pc - 12) << 8)]. - ^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: callAddress signedIntToLong - type: #call) - signal! Item was added: + ----- Method: GdbARMAlien>>handleExecutionPrimitiveFailureAt:in: (in category 'error handling') ----- + handleExecutionPrimitiveFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Handle an execution primitive failure for an unhandled opcode." + ^self reportPrimitiveFailure! Item was removed: - ----- Method: GdbARMAlien>>handleExecutionPrimitiveFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleExecutionPrimitiveFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Handle an execution primitive failure for an unhandled opcode." - ^self reportPrimitiveFailure! Item was added: + ----- Method: GdbARMAlien>>handleExecutionPrimitiveFailureIn:minimumAddress: (in category 'error handling') ----- + handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" + "Handle an execution primitive failure. Convert out-of-range call and absolute + memory read into register instructions into ProcessorSimulationTrap signals." + "self printRegistersOn: Transcript" + | pc | + ((pc := self pc) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: + [(self instructionTypeAt: pc in: memoryArray) + caseOf: { + [#Call] -> [^self handleCallFailureAt: pc in: memoryArray]. + [#Jump] -> [^self handleJmpFailureAt: pc in: memoryArray]. + [#MoveAwR] -> [^self handleMoveAwRFailureAt: pc in: memoryArray]. + [#MoveMbrR] -> [^self handleMoveMbrRFailureAt: pc in: memoryArray]. + [#MoveRAw] -> [^self handleMoveRAwFailureAt: pc in: memoryArray]. + [#MoveRMbr] -> [^self handleMoveRMbrFailureAt: pc in: memoryArray]. + [#Ret] -> [^self handleRetFailureAt: pc in: memoryArray].} + otherwise: [^self handleExecutionPrimitiveFailureAt: pc in: memoryArray]]. + ((pc := self lr - 4) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: + [(self instructionTypeAt: pc in: memoryArray) + caseOf: { + [#Call] -> [^self handleCallFailureAt: pc in: memoryArray]. + [#Jump] -> [^self handleJmpFailureAt: pc in: memoryArray]. + [#Ret] -> [^self handleRetFailureAt: pc in: memoryArray].} + otherwise: [^self handleExecutionPrimitiveFailureAt: pc in: memoryArray]]. + ^self reportPrimitiveFailure! Item was removed: - ----- Method: GdbARMAlien>>handleExecutionPrimitiveFailureIn:minimumAddress:readOnlyBelow: (in category 'error handling') ----- - handleExecutionPrimitiveFailureIn: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Handle an execution primitive failure. Convert out-of-range call and absolute - memory read into register instructions into ProcessorSimulationTrap signals." - "self printRegistersOn: Transcript" - | pc | - ((pc := self pc) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: - [(self instructionTypeAt: pc in: memoryArray) - caseOf: { - [#Call] -> [^self handleCallFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]. - [#Jump] -> [^self handleJmpFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]. - [#MoveAwR] -> [^self handleMoveAwRFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]. - [#MoveMbrR] -> [^self handleMoveMbrRFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]. - [#MoveRAw] -> [^self handleMoveRAwFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]. - [#MoveRMbr] -> [^self handleMoveRMbrFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]. - [#Ret] -> [^self handleRetFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress].} - otherwise: [^self handleExecutionPrimitiveFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]]. - ((pc := self lr - 4) between: minimumAddress and: memoryArray byteSize - 1) ifTrue: - [(self instructionTypeAt: pc in: memoryArray) - caseOf: { - [#Call] -> [^self handleCallFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]. - [#Jump] -> [^self handleJmpFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]. - [#Ret] -> [^self handleRetFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress].} - otherwise: [^self handleExecutionPrimitiveFailureAt: pc in: memoryArray readOnlyBelow: minimumWritableAddress]]. - ^self reportPrimitiveFailure! Item was added: + ----- Method: GdbARMAlien>>handleJmpFailureAt:in: (in category 'error handling') ----- + handleJmpFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a jmp into a ProcessorSimulationTrap signal." + | relativeJump | + self halt. + relativeJump := memoryArray longAt: pc + 2 bigEndian: false. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 5 + address: (pc + 5 + relativeJump) signedIntToLong + type: #jump) + signal! Item was removed: - ----- Method: GdbARMAlien>>handleJmpFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleJmpFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a jmp into a ProcessorSimulationTrap signal." - | relativeJump | - self halt. - relativeJump := memoryArray longAt: pc + 2 bigEndian: false. - ^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 5 - address: (pc + 5 + relativeJump) signedIntToLong - type: #jump) - signal! Item was added: + ----- Method: GdbARMAlien>>handleMoveAwRFailureAt:in: (in category 'error handling') ----- + handleMoveAwRFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a register load from an Address into a ProcessorSimulationTrap signal." + ((memoryArray byteAt: pc + 4) = 16rE5 "test for E593 as the most significant two bytes" + and: [(memoryArray byteAt: pc + 3) = (16r90 + (CogARMCompiler classPool at: #RISCTempReg))]) + ifTrue: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (memoryArray byteAt: pc + 1) "address, combined from four instructions" + + ((memoryArray byteAt: pc - 3) << 24) + + ((memoryArray byteAt: pc - 7) << 16) + + ((memoryArray byteAt: pc - 11) << 8) + type: #read + accessor: (self registerStateSetters at: ((memoryArray byteAt: pc + 2) >> 4) + 1)) + signal] + ifFalse: + [self reportPrimitiveFailure]! Item was removed: - ----- Method: GdbARMAlien>>handleMoveAwRFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMoveAwRFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a register load from an Address into a ProcessorSimulationTrap signal." - ((memoryArray byteAt: pc + 4) = 16rE5 "test for E593 as the most significant two bytes" - and: [(memoryArray byteAt: pc + 3) = (16r90 + (CogARMCompiler classPool at: #RISCTempReg))]) - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: (memoryArray byteAt: pc + 1) "address, combined from four instructions" - + ((memoryArray byteAt: pc - 3) << 24) - + ((memoryArray byteAt: pc - 7) << 16) - + ((memoryArray byteAt: pc - 11) << 8) - type: #read - accessor: (self registerStateSetters at: ((memoryArray byteAt: pc + 2) >> 4) + 1)) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was added: + ----- Method: GdbARMAlien>>handleMoveMbrRFailureAt:in: (in category 'error handling') ----- + handleMoveMbrRFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." + "MoveMbrR" + | modrmByte | + self halt. + ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" + ifTrue: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 6 + address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) + + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) + bitAnd: 16rFFFFFFFF) + type: #read + accessor: (#(al: cl: dl: bl: ah: ch: dh: bh:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) + signal] + ifFalse: + [self reportPrimitiveFailure]! Item was removed: - ----- Method: GdbARMAlien>>handleMoveMbrRFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMoveMbrRFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." - "MoveMbrR" - | modrmByte | - self halt. - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - bitAnd: 16rFFFFFFFF) - type: #read - accessor: (#(al: cl: dl: bl: ah: ch: dh: bh:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was added: + ----- Method: GdbARMAlien>>handleMoveRAwFailureAt:in: (in category 'error handling') ----- + handleMoveRAwFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a register write into Memory at a predefined address into a ProcessorSimulationTrap signal." + ^((memoryArray byteAt: pc + 4) = 16rE5 + and: [(memoryArray byteAt: pc + 3) = (16r80 + (CogARMCompiler classPool at: #RISCTempReg))]) + ifTrue: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (memoryArray byteAt: pc + 1) + + ((memoryArray byteAt: pc - 3) << 24) + + ((memoryArray byteAt: pc - 7) << 16) + + ((memoryArray byteAt: pc - 11) << 8) + type: #write + accessor: (self registerStateNames at: ((memoryArray byteAt: pc + 2) >> 4) + 1)) + signal] + ifFalse: + [self reportPrimitiveFailure]! Item was removed: - ----- Method: GdbARMAlien>>handleMoveRAwFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMoveRAwFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a register write into Memory at a predefined address into a ProcessorSimulationTrap signal." - ^((memoryArray byteAt: pc + 4) = 16rE5 - and: [(memoryArray byteAt: pc + 3) = (16r80 + (CogARMCompiler classPool at: #RISCTempReg))]) - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: (memoryArray byteAt: pc + 1) - + ((memoryArray byteAt: pc - 3) << 24) - + ((memoryArray byteAt: pc - 7) << 16) - + ((memoryArray byteAt: pc - 11) << 8) - type: #write - accessor: (self registerStateNames at: ((memoryArray byteAt: pc + 2) >> 4) + 1)) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was added: + ----- Method: GdbARMAlien>>handleMoveRMbrFailureAt:in: (in category 'error handling') ----- + handleMoveRMbrFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." + "MoveRMbr" + | modrmByte | + self halt. + ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" + ifTrue: + [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 6 + address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) + + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) + bitAnd: 16rFFFFFFFF) + type: #write + accessor: (#(al cl dl bl ah ch dh bh) at: ((modrmByte >> 3 bitAnd: 7) + 1))) + signal] + ifFalse: + [self reportPrimitiveFailure]! Item was removed: - ----- Method: GdbARMAlien>>handleMoveRMbrFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleMoveRMbrFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." - "MoveRMbr" - | modrmByte | - self halt. - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - bitAnd: 16rFFFFFFFF) - type: #write - accessor: (#(al cl dl bl ah ch dh bh) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was added: + ----- Method: GdbARMAlien>>handleRetFailureAt:in: (in category 'error handling') ----- + handleRetFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a ret into a ProcessorSimulationTrap signal." + self halt. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (memoryArray unsignedLongAt: self sp + 1) + type: #return + accessor: #pc:) + signal! Item was removed: - ----- Method: GdbARMAlien>>handleRetFailureAt:in:readOnlyBelow: (in category 'error handling') ----- - handleRetFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" readOnlyBelow: minimumWritableAddress "<Integer>" - "Convert an execution primitive failure for a ret into a ProcessorSimulationTrap signal." - self halt. - ^(ProcessorSimulationTrap - pc: pc - nextpc: pc + 4 - address: (memoryArray unsignedLongAt: self sp + 1) - type: #return - accessor: #pc:) - signal! Item was added: + ----- Method: GdbARMAlien>>primitiveRunInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- + primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" + minimumAddress: minimumAddress "<Integer>" + executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" + to: maxExecAndReadOnlyAddress "<Integer>" + "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the + memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." + <primitive: 'primitiveRunInMemoryMinimumAddressERFromTo' module: 'GdbARMPlugin' error: ec> + ^ec == #'inappropriate operation' + ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] + ifFalse: [self reportPrimitiveFailure] + + "self printRegistersOn: Transcript"! Item was changed: ----- Method: GdbARMAlien>>primitiveRunInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" maximumAddress: maximimAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range calls, jumps and memory read/writes into ProcessorSimulationTrap signals." <primitive: 'primitiveRunInMemoryMinAddressMaxAddressReadWrite' module: 'GdbARMPlugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] - minimumAddress: minimumAddress - readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure] "self printRegistersOn: Transcript"! Item was changed: ----- Method: GdbARMAlien>>primitiveRunInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range calls, jumps and memory read/writes into ProcessorSimulationTrap signals." <primitive: 'primitiveRunInMemoryMinimumAddressReadWrite' module: 'GdbARMPlugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] - minimumAddress: minimumAddress - readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure] "self printRegistersOn: Transcript"! Item was added: + ----- Method: GdbARMAlien>>primitiveSingleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- + primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" + minimumAddress: minimumAddress "<Integer>" + executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" + to: maxExecAndReadOnlyAddress "<Integer>" + "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the + memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." + <primitive: 'primitiveSingleStepInMemoryMinimumAddressERFromTo' module: 'GdbARMPlugin' error: ec> + ^ec == #'inappropriate operation' + ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] + ifFalse: [self reportPrimitiveFailure] + + "self printRegistersOn: Transcript"! Item was changed: ----- Method: GdbARMAlien>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" maximumAddress: maximimAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range calls, jumps and memory read/writes into ProcessorSimulationTrap signals." <primitive: 'primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite' module: 'GdbARMPlugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] - minimumAddress: minimumAddress - readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure]! Item was changed: ----- Method: GdbARMAlien>>primitiveSingleStepInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range calls, jumps and memory read/writes into ProcessorSimulationTrap signals." <primitive: 'primitiveSingleStepInMemoryMinimumAddressReadWrite' module: 'GdbARMPlugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress] - minimumAddress: minimumAddress - readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure]! Item was added: + ----- Method: GdbARMPlugin>>primitiveRunInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- + "cpuAlien <GdbARMAlien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" to: maxExecAndReadOnlyAddress "<Integer>" + "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." + | cpuAlien cpu maybeErr | + <var: #cpu type: #'void *'> + cpuAlien := self primitive: #primitiveRunInMemoryMinimumAddressERFromTo + parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) + receiver: #Oop. + (cpu := self startOfData: cpuAlien) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. + prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: + [prevInterruptCheckChain = 0]. + maybeErr := self runCPU: cpu + In: memory + Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) + MinAddress: minAddress + EROFrom: minExecAndReadOnlyAddress + To: maxExecAndReadOnlyAddress. + interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. + maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. + ^cpuAlien! Item was changed: ----- Method: GdbARMPlugin>>primitiveRunInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <GdbARMAlien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." | cpuAlien cpu memorySize maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveRunInMemoryMinAddressMaxAddressReadWrite parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) receiver: #Oop. (cpu := self startOfData: cpuAlien) = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: [prevInterruptCheckChain = 0]. memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. maybeErr := self runCPU: cpu In: memory Size: (memorySize min: maxAddress) MinAddressRead: minAddress Write: minWriteMaxExecAddress. interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. maybeErr ~= 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. ^cpuAlien! Item was added: + ----- Method: GdbARMPlugin>>primitiveSingleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- + "cpuAlien <GdbARMAlien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" to: maxExecAndReadOnlyAddress "<Integer>" + "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." + | cpuAlien cpu maybeErr | + <var: #cpu type: #'void *'> + cpuAlien := self primitive: #primitiveSingleStepInMemoryMinimumAddressERFromTo + parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) + receiver: #Oop. + (cpu := self startOfData: cpuAlien) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + maybeErr := self singleStepCPU: cpu + In: memory + Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) + MinAddress: minAddress + EROFrom: minExecAndReadOnlyAddress + To: maxExecAndReadOnlyAddress. + interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. + maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. + ^cpuAlien! Item was changed: ----- Method: GdbARMPlugin>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- "cpuAlien <GdbARMAlien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" + "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." - "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses." | cpuAlien cpu memorySize maybeErr | <var: #cpu type: #'void *'> cpuAlien := self primitive: #primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) receiver: #Oop. (cpu := self startOfData: cpuAlien) = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. + prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: + [prevInterruptCheckChain = 0]. memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. maybeErr := self singleStepCPU: cpu In: memory Size: (memorySize min: maxAddress) MinAddressRead: minAddress Write: minWriteMaxExecAddress. + interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. maybeErr ~= 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. ^cpuAlien! Item was changed: ----- Method: ProcessorSimulationTrap>>printOn: (in category 'printing') ----- printOn: aStream super printOn: aStream. + aStream nextPutAll: ' (pc: '; print: pc; nextPut: $/. pc printOn: aStream base: 16. + aStream nextPutAll: ' nextpc: '; print: nextpc; nextPut: $/. nextpc printOn: aStream base: 16. + aStream nextPutAll: ' address: '; print: address; nextPut: $/. address printOn: aStream base: 16. - aStream nextPutAll: ' (pc: '; print: pc. - aStream nextPutAll: ' nextpc: '; print: nextpc. - aStream nextPutAll: ' address: '; print: address. aStream nextPutAll: ' type: '; print: type. aStream nextPutAll: ' accessor: '; print: registerAccessor; nextPut: $)!

1 0

Re: [squeak-dev] A Bounty for CMake-ifying stack/Cog vm build process
by gettimothy 22 Nov '13

22 Nov '13

David, Thank you. I have joined that list and will continue the conversation there. Cordially, t. ---- On Fri, 08 Nov 2013 08:12:51 -0800 David T. Lewis<lewis(a)mail.msen.com> wrote ---- On Fri, Nov 08, 2013 at 07:29:42AM -0800, gettimothy wrote: > Eliot > > First, if these discussion is inappropriate for squeak-dev, I have subscribed to squeak-vm-beginners and we can move it there or elsewhere if I am creating too much noise here. > Hi Timothy, The vm-dev list is here: http://lists.squeakfoundation.org/cgi-bin/mailman/listinfo/vm-dev It is not a beginner's list, and your discussion would be welcome there. Either way, you are not creating "noise" and it is great to see you getting involved. > In working the steps at http://www.mirandabanda.org/cogblog/build-image/ and I have found that running all the tests for the Alien install on the SqueakVM that comes with the all-in-one app fails all but one of its tests. (primitives fail) > > If I start the image using the CogVM then all the tests pass. > > So, is it correct to say that building a Cog Development Image on Squeak4.4 or greater depends on a pre-built CogVM from http://www.mirandabanda.org/files/Cog/VM/ ? > > I am assuming yes, but I want to verify with you before I document what I am doing > It is a good idea to use a VM from mirandaband.org, because different VMs may have different runtime behaviour, and using a runtime environment that matches Eliot's will prevent confusion. Strictly speaking, you can build a Cog VM using pretty much any VM that works with your Squeak4.4 image. So no it is not necessary to use a specific pre-built image, but it is a very good idea to do so, especially during the time when you are first learning how to do VM building. I think Eliot will give you a similar answer, so hopefully he won't mind me stepping in to answer some of your questions. Dave > thx. > > t >

4 3

Debugging interpreter in VM when changing vm primitives
by Damien Cassou 22 Nov '13

22 Nov '13

http://stackoverflow.com/questions/20133537/debugging-interpreter-in-vm-whe… -- Damien Cassou http://damiencassou.seasidehosting.st "Success is the ability to go from one failure to another without losing enthusiasm." Winston Churchill

1 0

[commit][2807] look for plugins.{int,ext,exc} in build, unix/cmake and src; parse plugin lists more robustly
by commits＠squeakvm.org 20 Nov '13

20 Nov '13

Revision: 2807 Author: piumarta Date: 2013-11-13 19:44:42 -0800 (Wed, 13 Nov 2013) Log Message: ----------- look for plugins.{int,ext,exc} in build, unix/cmake and src; parse plugin lists more robustly Modified Paths: -------------- trunk/platforms/unix/cmake/Plugins.cmake Modified: trunk/platforms/unix/cmake/Plugins.cmake =================================================================== --- trunk/platforms/unix/cmake/Plugins.cmake 2013-11-14 02:20:08 UTC (rev 2806) +++ trunk/platforms/unix/cmake/Plugins.cmake 2013-11-14 03:44:42 UTC (rev 2807) @@ -1,38 +1,44 @@ # Figure out which plugins to build and create a configuration for each. # -# Last edited: 2013-11-11 19:12:21 by piumarta on emilia +# Last edited: 2013-11-13 19:43:20 by piumarta on emilia -IF (EXISTS ${config}/plugins.int) +IF (EXISTS ${bld}/plugins.int) + FILE (STRINGS ${bld}/plugins.int plugins_int) +ELSEIF (EXISTS ${config}/plugins.int) FILE (STRINGS ${config}/plugins.int plugins_int) ELSEIF (EXISTS ${src}/plugins.int) FILE (STRINGS ${src}/plugins.int plugins_int) ELSE (EXISTS ${src}/plugins.int) - MESSAGE (FATAL_ERROR "Cannot find plugins.int in ${src} or ${config}") -ENDIF (EXISTS ${config}/plugins.int) + MESSAGE (FATAL_ERROR "Cannot find plugins.int in ${bld}, ${config} or ${src}") +ENDIF (EXISTS ${bld}/plugins.int) -STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_int ${plugins_int}) -STRING (REPLACE " " ";" plugins_int ${plugins_int}) +STRING (REGEX REPLACE ".*= *(.*)" "\\1" plugins_int ${plugins_int}) +STRING (REPLACE " " ";" plugins_int "${plugins_int}") -IF (EXISTS ${config}/plugins.ext) +IF (EXISTS ${bld}/plugins.ext) + FILE (STRINGS ${bld}/plugins.ext plugins_ext) +ELSEIF (EXISTS ${config}/plugins.ext) FILE (STRINGS ${config}/plugins.ext plugins_ext) ELSEIF (EXISTS ${src}/plugins.ext) FILE (STRINGS ${src}/plugins.ext plugins_ext) ELSE (EXISTS ${src}/plugins.ext) - MESSAGE (FATAL_ERROR "Cannot find plugins.ext in ${src} or ${config}") -ENDIF (EXISTS ${config}/plugins.ext) + MESSAGE (FATAL_ERROR "Cannot find plugins.ext in ${bld}, ${config} or ${src}") +ENDIF (EXISTS ${bld}/plugins.ext) -STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_ext ${plugins_ext}) -STRING (REPLACE " " ";" plugins_ext ${plugins_ext}) +STRING (REGEX REPLACE ".*= *(.*)" "\\1" plugins_ext ${plugins_ext}) +STRING (REPLACE " " ";" plugins_ext "${plugins_ext}") +IF (EXISTS ${bld}/plugins.exc) + FILE (STRINGS ${bld}/plugins.exc plugins_exc) IF (EXISTS ${config}/plugins.exc) FILE (STRINGS ${config}/plugins.exc plugins_exc) ELSEIF (EXISTS ${src}/plugins.exc) FILE (STRINGS ${src}/plugins.exc plugins_exc) -ENDIF (EXISTS ${config}/plugins.exc) +ENDIF (EXISTS ${bld}/plugins.exc) IF (DEFINED plugins_exc) - STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_exc ${plugins_exc}) - STRING (REPLACE " " ";" plugins_exc ${plugins_exc}) + STRING (REGEX REPLACE ".*= *(.*)" "\\1" plugins_exc ${plugins_exc}) + STRING (REPLACE " " ";" plugins_exc "${plugins_exc}") FOREACH (plugin ${plugins_exc}) MESSAGE ("!! excluding plugin ${plugin}") LIST (REMOVE_ITEM plugins_int ${plugin})

4 6

Spur Object 64 bit format
by Nicolas Cellier 20 Nov '13

20 Nov '13

The scheme is currently ...001 -> immediate int ...010 -> immediate char ...100 -> immediate double But with 64 bits, 62 remaining for immediate char, that makes many char, well too many compared to Unicode requirements... What about swapping pattern for char and double? I know it complicates a little bit the 32 <-> 64 image translation, but this gains one more bit for immediate double exponent that is otherwise unused for char. Also, there is room for more immediate values, for example a single precision float. Is there any interest?

7 17

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2013