Vm-dev May 2010

vm-dev@lists.squeakfoundation.org

22 participants
59 discussions

ffi-test-main.c fails on FreeBSD
by Gary Dunn 12 Aug '16

12 Aug '16

In conjunction with getting Open Cobalt running on FreeBSD I have been looking into the problems with SqueakFFIPrims on FreeBSD and have reached a point that is beyond my understanding. I am not sure if the fix should come from the VM side or the FreeBSD port maintainer. I needed to get source code back into the ports tree so I did a make in /usr/ports/lang/squeak. I already had the 3.9 tarball, so that just repopulated the source and did the initial build. In the "files" folder I found patch files typical for a FreeBSD port. These patch source files from a generic tarball to work with FreeBSD. The one of interest was patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config which contains ----x-----x----- --- platforms/unix/plugins/SqueakFFIPrims/ffi-config.org Wed Apr 26 20:27:53 2006 +++ platforms/unix/plugins/SqueakFFIPrims/ffi-config Wed Apr 26 20:29:00 2006 @@ -39,6 +39,7 @@ case ${abi} in linux) abi=sysv;; + freebsd*) abi=sysv;; darwin*) abi=darwin;; *) abi=libffi; lib="-lffi";; esac -----x-----x----- I then had the folder work/Squeak-3.9-7/platforms/unix/plugins/SqueakFFIPrims In it is a file 00README which explains how to test FFI. It says to run ffi-test-config but I have no such file. It says to type "make" to build a test suite but the build failed. It says to try with make CPU=any ABI=libffi LIB=-lffi which also failed. I traced the problem to the gcc search paths for includes and libraries -- turns out FreeBSD only searches /usr/include and /usr/lib when the required files are in /usr/local/include and /usr/local/lib. After some fiddling I finally had a "main" to test. It failed: ffi-test-main.c failed at line 361. Here is a bit from that file, ending with line 361: ffiInitialize(); for (ul= 0; ul < 15; ++ul) ffiPushSingleFloat(fa[ul]); GO(FFITypeSingleFloat, many); f= ffiReturnFloatValue(); ffiCleanup(); CHECK(f - ff < FLT_EPSILON); I worked out the CHECK macro but could not find what FLT_EPSILON is. At that point I decided to stop and come to you for help. Where do I go from here? -- Gary Dunn, Honolulu osp(a)aloha.com http://openslate.net/ http://e9erust.blogspot.com/ Sent from Slate001

5 8

Profiling and delay accuracy
by Andreas Raab 06 Aug '11

06 Aug '11

Hi Folks - For a long time now I had this feeling that MessageTally reports pretty bogus results in many situations without being able to precisely track down why this would be the case. Today I was looking at primitiveResponse() and, much to my surprise, noticed that the checkForInterrupts() that used to be there for years is gone (see Squeak3.6 for example which still has it). The sole reason for this check was to get both high delay accuracy and good profiling behavior. Consider this example: fc := FormCanvas on: Display. MessageTally spyOn:[ 1 to: 100 do:[:i| fc fillColor: Color white. fc printString. ]. ]. Using 3.6 this will be measured correctly as: **Tree** 87.5% {243ms} FormCanvas>>fillColor: |87.5% {243ms} GrafPort>>fillRect:offset: | 87.5% {243ms} GrafPort>>copyBits 12.5% {35ms} FormCanvas(Object)>>printString 12.5% {35ms} FormCanvas(Object)>>printStringLimitedTo: whereas the 3.10 reports it as **Tree** 99.6% {670ms} FormCanvas(Object)>>printString 94.9% {639ms} primitives 4.6% {31ms} FormCanvas(Object)>>printStringLimitedTo: I think you can see the problem and just imagine what this does to any cumulative results. I also wonder what that change does to platforms that don't have high-resolution asynchronous timers. This used to be the one place where we would catch timer changes at high resolution and unless the platform forces high resolution timer interrupts asynchronously (by resetting the interrupt counter) we must be loosing a lot in terms of delay accuracy. (it just so happens that the Windows VM *does* do asynchronous timer interrupts so I never noticed this but I'm very curious about the difference on Linux which typically still has pretty bad timer granularity). Any opinions? My feeling is that the timer check should go back in for all of the above reasons. At the very least a quickCheckForInterrupt() is required but I actually think putting the full check back in is worth it. Cheers, - Andreas

3 3

4.0.3.2196 for Unix
by Ian Piumarta 08 May '11

08 May '11

Folks, Source and binaries for Linux/i386, Darwin/i386 & Darwin/PPC now available. (Solaris, NetBSD and FreeBSD still at 3.11.3 until I get my kvm working again.) http://squeakvm.org/unix Enjoy! Ian Major changes since 3.11.3.2135: Generated sources rebuilt from VMMaker-dtl.169. Re-enabled MIDI support via ALSA on Linux. Broken locales should no longer cause line ends to go missing during copy and paste. Add support for "platform source version" primitive. Remove debugging beep on first clipboard copy under X11. Allow fully-qualified pathnames when loading modules. Bundle FreetypePlugin with source and binary releases. Various fixes for 64-bit cleanliness (many thanks to Dave Lewis). Add microsecond clock support. Fix launching from a menu under KDE. Fix --CFLAGS option in configure script. Serial plugin invalidates cached port names on close. Better handling of symlinks when looking for absolute path to VM binary.

5 12

Joys of Squeak-dev image, VM Compiling on MacIntel and Spoon remote OtherBrowsing
by Ken G. Brown 16 Nov '10

16 Nov '10

MacPro OS X 10.4.9 Xcode 2.4.1 Squeak-dev-114-2, VMMaker 2.8b6.1, Squeak 3.8.15beta6U.app, and version 1657 of svn MacOS VM sources, and Spoon v2a12. Downloaded http://www.squeakvm.org/cgi-bin/viewcvs.cgi/ trunk version 1657 for MacOS Ran squeak-dev-beta-114-2.image on Squeak 3.8.15beta6U.app Loaded VMMaker 3.8b6.1 from dev image Universes. Generated vm sources by following instructions in <http://www.squeakvm.org/cgi-bin/viewcvs.cgi/trunk/platforms/Mac%20OS/vm/Doc…> Fought with Xcode wanting to use MacOSX10.3.9.sdk for ppc which was giving an error which was known and documented in the Readme. Finally figured out what Xcode wanted so built universal app just using 10.4.9 sdk. Couple issues: Exupery references remain in sqnamedPrims.h and sqPlatformSpecific.h from svn version 1657, I just commented them out. Notes said: Info-NPSqueak__Upgraded_.plist was to be found in the Developer directory. I could not find it so scammed a info.plist out of John's Squeak 3.8.15beta6U.app vm. Not sure what impact this has. And much, much diddling about figuring out various things... Finally got a build. It's a lot smaller (3.9MB) than John McIntosh's Squeak 3.8.15beta6U.app (8.1MB), and it looks like it is a PowerPC one but at least it runs. I'll look into the Xcode build process some more. Then: Replaced interp.c with Craig's interp.c for Spoon, rebuilt and got a VM with Spoon client stuff. Downloaded Spoon release 2a12. Moved a copy of Flow plugin from within Craig's naiad.app package into a plugins subdirectory where the new spoon client compatible MacIntel universal VM was run from. Followed Craig's Spoon instructions for loading niaid.st and niaid.pr into the 3.10 image (Squeak-dev-114-2) running on the new VM. Did the run spoon.app thing from Spoon.dmg (version 2a12), needs to be done twice if Safari is not running. Got Spoon processor running. Followed instructions again in the Spoon client and lo! Got OtherBrowser browsing the Spoon memory running on processor. Yay Craig! Who do i get to sign my certificate? :) Ken

4 7

normalSend, specialObjectsArray and VM
by Mariano Martinez Peck 03 Oct '10

03 Oct '10

Hi folks. I need to intercept ALL message sends. For the moment, I intercepted in Interpreter >> normalSend But now, I have a question: I know there is that specialObjectArray that contain objects that may be accessed by the VM. So, the first question is, they are only ACCESSED and to things with pointers or they also send messages to those objects from the VM? If the VM really send messages to those object, how that is done ? The code goes also by normalSend ? Or they go from somewhere else that I am not intercepting. Thank you very much. Mariano

7 17

Simulate "3+4" with InterpreterSimulator
by Ang BeePeng 08 Sep '10

08 Sep '10

Hi, I have a InterpreterSimulator start up, in a workspace I type "3+4". From here, I want to step through bytecode per bytecode, when I hit "print". What should I do to achieve this? Can I debug on the interpreter in the middle of the simulation? Or perhaps I need to put a "self halt" somewhere in the VM source? Thanks. Ang Beepeng -- View this message in context: http://n4.nabble.com/Simulate-3-4-with-InterpreterSimulator-tp1678060p16780… Sent from the Squeak - VM mailing list archive at Nabble.com.

5 20

VM Maker: VMMaker-dtl.178.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 31 May '10

31 May '10

Dave Lewis uploaded a new version of VMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/VMMaker-dtl.178.mcz ==================== Summary ==================== Name: VMMaker-dtl.178 Author: dtl Time: 31 May 2010, 4:50:57 am UUID: 650ed951-209c-4361-80f1-3cf6bdb4b0e9 Ancestors: VMMaker-dtl.177 Add ObjectMemoryVariablesTest to document the values of constants defined in ObjectMemory class>>initBytesPerWord: =============== Diff against VMMaker-dtl.177 =============== Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte5Shift (in category 'testing - constants') ----- + testByte5Shift + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte5Shift = 0." + + self assert: ObjectMemory byte5Shift = 40! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte6Shift (in category 'testing - constants') ----- + testByte6Shift + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte6Shift = 0." + + self assert: ObjectMemory byte6Shift = 48! Item was added: + ----- Method: ObjectMemory class>>byte4Mask (in category 'accessing') ----- + byte4Mask + ^Byte4Mask! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte0Mask (in category 'testing - constants') ----- + testByte0Mask + + self assert: ObjectMemory byte0Mask = 16r00000000000000FF! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte7ShiftNegated (in category 'testing - constants') ----- + testByte7ShiftNegated + "Note - signed values are not relevant for bit mask operations, can be recoded as positive" + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte7ShiftNegated = 16r0000000000000000." + + self assert: ObjectMemory byte7ShiftNegated = -16r0000000000000038! Item was added: + ----- Method: ObjectMemory class>>byte5Mask (in category 'accessing') ----- + byte5Mask + ^Byte5Mask! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte1Mask (in category 'testing - constants') ----- + testByte1Mask + + self assert: ObjectMemory byte1Mask = 16r000000000000FF00! Item was added: + ----- Method: ObjectMemory class>>bytes7to4Mask (in category 'accessing') ----- + bytes7to4Mask + ^Bytes7to4Mask! Item was added: + ----- Method: ObjectMemory class>>byte6Mask (in category 'accessing') ----- + byte6Mask + ^Byte6Mask! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte2Mask (in category 'testing - constants') ----- + testByte2Mask + + self assert: ObjectMemory byte2Mask = 16r0000000000FF0000! Item was added: + ----- Method: ObjectMemory class>>byte4ShiftNegated (in category 'accessing') ----- + byte4ShiftNegated + ^Byte4ShiftNegated! Item was added: + ----- Method: ObjectMemory class>>byte1Shift (in category 'accessing') ----- + byte1Shift + ^Byte1Shift! Item was added: + ----- Method: ObjectMemory class>>byte2Shift (in category 'accessing') ----- + byte2Shift + ^Byte2Shift! Item was added: + ----- Method: ObjectMemory class>>byte7Mask (in category 'accessing') ----- + byte7Mask + ^Byte7Mask! Item was added: + ----- Method: ObjectMemory class>>byte6Shift (in category 'accessing') ----- + byte6Shift + ^Byte6Shift! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte3Mask (in category 'testing - constants') ----- + testByte3Mask + + self assert: ObjectMemory byte3Mask = 16r00000000FF000000! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte1ShiftNegated (in category 'testing - constants') ----- + testByte1ShiftNegated + "Note - signed values are not relevant for bit mask operations, can be recoded as positive" + + self assert: ObjectMemory byte1ShiftNegated = -16r0000000000000008.! Item was added: + ----- Method: ObjectMemory class>>byte3ShiftNegated (in category 'accessing') ----- + byte3ShiftNegated + ^Byte3ShiftNegated! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte4Mask (in category 'testing - constants') ----- + testByte4Mask + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte4Mask = 16r0000000000000000." + + self assert: ObjectMemory byte4Mask = 16r000000FF00000000! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte2Shift (in category 'testing - constants') ----- + testByte2Shift + + self assert: ObjectMemory byte2Shift = 16! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte3Shift (in category 'testing - constants') ----- + testByte3Shift + + self assert: ObjectMemory byte3Shift = 24! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte5Mask (in category 'testing - constants') ----- + testByte5Mask + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte5Mask = 16r0000000000000000." + + self assert: ObjectMemory byte5Mask = 16r0000FF0000000000! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte7Shift (in category 'testing - constants') ----- + testByte7Shift + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte7Shift = 0." + + self assert: ObjectMemory byte7Shift = 56! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte3ShiftNegated (in category 'testing - constants') ----- + testByte3ShiftNegated + "Note - signed values are not relevant for bit mask operations, can be recoded as positive" + + self assert: ObjectMemory byte3ShiftNegated = -16r0000000000000018! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte6Mask (in category 'testing - constants') ----- + testByte6Mask + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte6Mask = 16r0000000000000000." + + self assert: ObjectMemory byte6Mask = 16r00FF000000000000! Item was added: + ----- Method: ObjectMemory class>>byte5ShiftNegated (in category 'accessing') ----- + byte5ShiftNegated + ^Byte5ShiftNegated! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte7Mask (in category 'testing - constants') ----- + testByte7Mask + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte7Mask = 16r0000000000000000." + + self assert: ObjectMemory byte7Mask = 16rFF00000000000000! Item was added: + ----- Method: ObjectMemory class>>byte3Shift (in category 'accessing') ----- + byte3Shift + ^Byte3Shift! Item was added: + ----- Method: ObjectMemory class>>byte7Shift (in category 'accessing') ----- + byte7Shift + ^Byte7Shift! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte5ShiftNegated (in category 'testing - constants') ----- + testByte5ShiftNegated + "Note - signed values are not relevant for bit mask operations, can be recoded as positive" + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte5ShiftNegated = 16r0000000000000000." + + self assert: ObjectMemory byte5ShiftNegated = -16r0000000000000028! Item was added: + ----- Method: ObjectMemory class>>byte7ShiftNegated (in category 'accessing') ----- + byte7ShiftNegated + ^Byte7ShiftNegated! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte0Shift (in category 'testing - constants') ----- + testByte0Shift + + self assert: ObjectMemory byte0Shift = 0! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte4ShiftNegated (in category 'testing - constants') ----- + testByte4ShiftNegated + "Note - signed values are not relevant for bit mask operations, can be recoded as positive" + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory byte4ShiftNegated = 16r0000000000000000." + + self assert: ObjectMemory byte4ShiftNegated = -16r0000000000000020! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte4Shift (in category 'testing - constants') ----- + testByte4Shift + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemoryConstantsAccess byte4Shift = 0." + + self assert: ObjectMemory byte4Shift = 32! Item was added: + TestCase subclass: #ObjectMemoryVariablesTest + instanceVariableNames: 'saveWordSize omv32 omv64' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Tests'! + + !ObjectMemoryVariablesTest commentStamp: 'dtl 5/31/2010 16:47' prior: 0! + ObjectMemoryVariablesTest validates the values of the constants defined in ObjectMemory class>>initBytesPerWord: + + The intent is to enable rewriting these constants in a manner that permits them to be fully defined as C preprocessor macros at compile time, such that separate code generation is not required for 32-bit and 64-bit object memory. + + See CCodeGenerator>>emitDefineBytesPerWordOn: for the C preprocessor macro definitions.! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testBytes7to4Mask (in category 'testing - constants') ----- + testBytes7to4Mask + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory bytes7to4Mask = 16r0000000000000000." + + self assert: ObjectMemory bytes7to4Mask = 16rFFFFFFFF00000000! Item was added: + ----- Method: ObjectMemory class>>byte1ShiftNegated (in category 'accessing') ----- + byte1ShiftNegated + ^Byte1ShiftNegated! Item was added: + ----- Method: ObjectMemory class>>byte0Mask (in category 'accessing') ----- + byte0Mask + ^Byte0Mask! Item was added: + ----- Method: ObjectMemory class>>byte0Shift (in category 'accessing') ----- + byte0Shift + ^Byte0Shift! Item was added: + ----- Method: ObjectMemory class>>byte1Mask (in category 'accessing') ----- + byte1Mask + ^Byte1Mask! Item was added: + ----- Method: ObjectMemory class>>byte4Shift (in category 'accessing') ----- + byte4Shift + ^Byte4Shift! Item was added: + ----- Method: ObjectMemory class>>byte5Shift (in category 'accessing') ----- + byte5Shift + ^Byte5Shift! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testBytes3to0Mask (in category 'testing - constants') ----- + testBytes3to0Mask + + "Note - unused for 32-bit object memory, so 32-bit test is no longer relevant + ObjectMemory initBytesPerWord: 4. + self assert: ObjectMemory bytes3to0Mask = 16r0000000000000000." + + self assert: ObjectMemory bytes3to0Mask = 16r00000000FFFFFFFF! Item was added: + ----- Method: ObjectMemory class>>byte2Mask (in category 'accessing') ----- + byte2Mask + ^Byte2Mask! Item was added: + ----- Method: ObjectMemory class>>bytes3to0Mask (in category 'accessing') ----- + bytes3to0Mask + ^Bytes3to0Mask! Item was added: + ----- Method: ObjectMemory class>>byte3Mask (in category 'accessing') ----- + byte3Mask + ^Byte3Mask! Item was added: + ----- Method: ObjectMemoryVariablesTest>>testByte1Shift (in category 'testing - constants') ----- + testByte1Shift + + self assert: ObjectMemory byte1Shift = 8!

1 0

Status of Alien FFI in windows Re: [Pharo-project] plan for 1.1
by Mariano Martinez Peck 31 May '10

31 May '10

So...which is the status of Alien FFI ? I remember Marco Schmidt did the first work of running FFI in windows...then I think David was integrating such changes in VMMaker.. so, it is ready ? can be generate the plugin using VMMaker for winwows and it just works? Thanks for any update Mariano 2010/5/26 Guillermo Polito <guillermopolito(a)gmail.com> > Where can I read something about Alien? I can give a little hand for the > windows part :). > > > On Wed, May 26, 2010 at 11:12 AM, Schwab,Wilhelm K <bschwab(a)anest.ufl.edu>wrote: > >> Stef, >> >> I am more concerned about Alien on Linux, which is not working. Beyond >> that, I want to learn more about how to make calls using Alien; the more I >> read, the more I have my doubts about its ease of use. I will gladly eat >> those words if it's easy to use. >> >> Bill >> >> >> >> ________________________________________ >> From: pharo-project-bounces(a)lists.gforge.inria.fr [ >> pharo-project-bounces(a)lists.gforge.inria.fr] On Behalf Of Stéphane >> Ducasse [stephane.ducasse(a)inria.fr] >> Sent: Wednesday, May 26, 2010 10:04 AM >> To: Pharo-project(a)lists.gforge.inria.fr >> Subject: Re: [Pharo-project] plan for 1.1 >> >> yes this is good point. >> I would like to have alien or ffi in 1.1. Now I do not know the status of >> Alien on windows. >> >> On May 26, 2010, at 2:52 PM, Schwab,Wilhelm K wrote: >> >> > Stef, >> > >> > My initial reaction to 1.1's approaching release was "where are the >> callbacks/aliens?" Sig appears to be offering some competition to Alien. >> If he/we can provide a comprehensive and convenient way to make calls, do >> callbacks, additionally put calls onto other OS threads, and do all of this >> on the three major platforms, then it could easily turn out the best option >> for external interfacing. >> > >> > I am happy to see us take time to get it right. My only concern would >> be that we not fall into a pattern of leaving out the difficult things that >> we set out to accomplish with a given release. Since 1.1 is approaching >> releasable form and FFI/Alien/NB is unclear at present, a release makes >> sense. >> > >> > Short answer: sure, whatever you say :) >> > >> > Bill >> > >> > >> > ________________________________________ >> > From: pharo-project-bounces(a)lists.gforge.inria.fr [ >> pharo-project-bounces(a)lists.gforge.inria.fr] On Behalf Of Stéphane >> Ducasse [stephane.ducasse(a)inria.fr] >> > Sent: Wednesday, May 26, 2010 4:20 AM >> > To: Pharo Development >> > Subject: [Pharo-project] plan for 1.1 >> > >> > Hi guys >> > >> > we were discussing how we can handle 1.1 and the flux of good changes. >> > Here is the proposal: >> > we take two or three weeks to let people try their code in 1.1 >> beta >> > we integrate fixes that are important or easy >> > then we wait one week >> > then we launch 1.1 rc and 1.2 unstable >> > >> > does this plan look ok for you? >> > The key point is that we want to avoid to have a pile of changes pending >> because they can rot easily. >> > >> > Stef >> > _______________________________________________ >> > Pharo-project mailing list >> > Pharo-project(a)lists.gforge.inria.fr >> > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> > >> > _______________________________________________ >> > Pharo-project mailing list >> > Pharo-project(a)lists.gforge.inria.fr >> > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> >> >> _______________________________________________ >> Pharo-project mailing list >> Pharo-project(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> >> _______________________________________________ >> Pharo-project mailing list >> Pharo-project(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> > > > _______________________________________________ > Pharo-project mailing list > Pharo-project(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >

2 1

[commit] r2211 - Import of Scratch CameraPlugin support code.
by commits＠squeakvm.org 28 May '10

28 May '10

Author: andreas Date: 2010-05-28 13:36:27 -0700 (Fri, 28 May 2010) New Revision: 2211 Added: trunk/platforms/win32/plugins/CameraPlugin/ trunk/platforms/win32/plugins/CameraPlugin/Building Windows CameraPlugin.txt trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.cpp trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.dll trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.vcproj trunk/platforms/win32/plugins/CameraPlugin/DirectShow BaseClasses project/ trunk/platforms/win32/plugins/CameraPlugin/DirectShow BaseClasses project/baseclasses.sln trunk/platforms/win32/plugins/CameraPlugin/DirectShow BaseClasses project/baseclasses.vcproj trunk/platforms/win32/plugins/CameraPlugin/STRMBASE.lib trunk/platforms/win32/plugins/CameraPlugin/cameraOps.h trunk/platforms/win32/plugins/CameraPlugin/sqVirtualMachine.h trunk/platforms/win32/plugins/CameraPlugin/winCameraOps.cpp Log: Import of Scratch CameraPlugin support code. Added: trunk/platforms/win32/plugins/CameraPlugin/Building Windows CameraPlugin.txt =================================================================== --- trunk/platforms/win32/plugins/CameraPlugin/Building Windows CameraPlugin.txt (rev 0) +++ trunk/platforms/win32/plugins/CameraPlugin/Building Windows CameraPlugin.txt 2010-05-28 20:36:27 UTC (rev 2211) @@ -0,0 +1,31 @@ +1. Installs: + Visual Studio .NET (2003) v7.1 + Microsoft Platform SDK for Windows Server 2003 R2 + (You do not need to install DirectX) + +2. Build the base class library + Download the VS project files from: + http://tmhare.mvps.org/downloads.htm + Place in folder: + C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Samples\Multimedia\DirectShow\BaseClasses + Open project (allow it to update if asked) + Set configuration to "release" + Build the project + Get STRMBASE.lib from the Release folder + +3. Create CameraPlugin project + a. Open VisualStudio + b. New -> Project + c. select template "MFC DLL" (under Visual C++ Projects/MFC) + d. Under "Application Settings", select "Regular DLL with MFC statically linked" + e. remove all .cpp, .h, and resource files + f. add camera plugin source files + e. disable "precompiled headers" option + f. under "Linker/Input" options, remove "Module Definition File" + g. copy STRMBASE.lib to folder and add to project + + +Useful links: + http://www.ptgrey.com/support/downloads/documents/TAN2007003_Developing_Dir… + http://tmhare.mvps.org/downloads.htm (VC projects for base classes) + Added: trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.cpp =================================================================== --- trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.cpp (rev 0) +++ trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.cpp 2010-05-28 20:36:27 UTC (rev 2211) @@ -0,0 +1,160 @@ +/* Automatically generated from Squeak on (29 April 2009 6:59:14 am) */ + +#if defined(WIN32) || defined(_WIN32) || defined(Win32) + #ifdef __cplusplus + #define DLLEXPORT extern "C" __declspec(dllexport) + #else + #define DLLEXPORT __declspec(dllexport) + #endif /* C++ */ +#else + #define DLLEXPORT +#endif /* WIN32 */ + +#include "sqVirtualMachine.h" + +/* memory access macros */ +#define byteAt(i) (*((unsigned char *) (i))) +#define byteAtput(i, val) (*((unsigned char *) (i)) = val) +#define longAt(i) (*((int *) (i))) +#define longAtput(i, val) (*((int *) (i)) = val) + +#include "cameraOps.h" +#include <string.h> + + +/*** Variables ***/ +struct VirtualMachine* interpreterProxy; +const char *moduleName = "CameraPlugin 29 April 2009 (e)"; + +/*** Functions ***/ +DLLEXPORT int primCameraName(void); +DLLEXPORT int primCloseCamera(void); +DLLEXPORT int primFrameExtent(void); +DLLEXPORT int primGetFrame(void); +DLLEXPORT int primGetParam(void); +DLLEXPORT int primOpenCamera(void); +DLLEXPORT int setInterpreter(struct VirtualMachine* anInterpreter); + +DLLEXPORT int primCameraName(void) { + char* nameStr; + int i; + int count; + int resultOop; + int cameraNum; + char* dst; + + cameraNum = interpreterProxy->stackIntegerValue(0); + if (interpreterProxy->failed()) { + return 0; + } + nameStr = CameraName(cameraNum); + if (nameStr == 0) { + interpreterProxy->success(0); + return 0; + } + count = (int) strlen(nameStr); + resultOop = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classString(), count); + dst = ((char *) (interpreterProxy->firstIndexableField(resultOop))); + for (i = 0; i <= (count - 1); i += 1) { + dst[i] = (nameStr[i]); + } + interpreterProxy->popthenPush(2, resultOop); + return 0; +} + +DLLEXPORT int primCloseCamera(void) { + int cameraNum; + + cameraNum = interpreterProxy->stackIntegerValue(0); + if (interpreterProxy->failed()) { + return 0; + } + CameraClose(cameraNum); + interpreterProxy->pop(1); + return 0; +} + +DLLEXPORT int primFrameExtent(void) { + int cameraNum; + int e; + + cameraNum = interpreterProxy->stackIntegerValue(0); + if (interpreterProxy->failed()) { + return 0; + } + e = CameraExtent(cameraNum); + interpreterProxy->popthenPush(2, ((e << 1) | 1)); + return 0; +} + +DLLEXPORT int primGetFrame(void) { + int cameraNum; + int bitmapOop; + unsigned char *bitmap; + int pixCount; + int result; + + cameraNum = interpreterProxy->stackIntegerValue(1); + bitmapOop = interpreterProxy->stackValue(0); + if (((bitmapOop & 1)) || (!(interpreterProxy->isWords(bitmapOop)))) { + interpreterProxy->success(0); + return 0; + } + bitmap = ((unsigned char *) (interpreterProxy->firstIndexableField(bitmapOop))); + pixCount = interpreterProxy->stSizeOf(bitmapOop); + result = CameraGetFrame(cameraNum, bitmap, pixCount); + if (result < 0) { + interpreterProxy->success(0); + return 0; + } + interpreterProxy->popthenPush(3, ((result << 1) | 1)); + return 0; +} + +DLLEXPORT int primGetParam(void) { + int cameraNum; + int result; + int paramNum; + + cameraNum = interpreterProxy->stackIntegerValue(1); + paramNum = interpreterProxy->stackIntegerValue(0); + if (interpreterProxy->failed()) { + return 0; + } + result = CameraGetParam(cameraNum, paramNum); + interpreterProxy->popthenPush(3, ((result << 1) | 1)); + return 0; +} + +DLLEXPORT int primOpenCamera(void) { + int cameraNum; + int desiredFrameWidth; + int ok; + int desiredFrameHeight; + + cameraNum = interpreterProxy->stackIntegerValue(2); + desiredFrameWidth = interpreterProxy->stackIntegerValue(1); + desiredFrameHeight = interpreterProxy->stackIntegerValue(0); + if (interpreterProxy->failed()) { + return 0; + } + ok = CameraOpen(cameraNum, desiredFrameWidth, desiredFrameHeight); + if (ok == 0) { + interpreterProxy->success(0); + return 0; + } + interpreterProxy->pop(3); + return 0; +} + +DLLEXPORT int setInterpreter(struct VirtualMachine* anInterpreter) { + int ok; + + interpreterProxy = anInterpreter; + ok = interpreterProxy->majorVersion() == VM_PROXY_MAJOR; + if (ok == 0) { + return 0; + } + ok = interpreterProxy->minorVersion() >= VM_PROXY_MINOR; + return ok; +} Added: trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.dll =================================================================== (Binary files differ) Property changes on: trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.vcproj =================================================================== --- trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.vcproj (rev 0) +++ trunk/platforms/win32/plugins/CameraPlugin/CameraPlugin.vcproj 2010-05-28 20:36:27 UTC (rev 2211) @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="CameraPlugin" + ProjectGUID="{E075D391-317C-4CC9-9E40-7DEABF0BF7E0}" + Keyword="MFCDLLProj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug" + ConfigurationType="2" + UseOfMFC="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + TreatWChar_tAsBuiltInType="TRUE" + UsePrecompiledHeader="3" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/CameraPlugin.dll" + LinkIncremental="2" + ModuleDefinitionFile=".\CameraPlugin.def" + GenerateDebugInformation="TRUE" + SubSystem="2" + ImportLibrary="$(OutDir)/CameraPlugin.lib" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="FALSE"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + AdditionalIncludeDirectories="$(IntDir)"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release" + ConfigurationType="2" + UseOfMFC="1" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL" + RuntimeLibrary="0" + TreatWChar_tAsBuiltInType="TRUE" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)/CameraPlugin.dll" + LinkIncremental="1" + ModuleDefinitionFile="" + GenerateDebugInformation="TRUE" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)/CameraPlugin.lib" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="FALSE"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="$(IntDir)"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath=".\CameraPlugin.cpp"> + </File> + <File + RelativePath=".\winCameraOps.cpp"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter=""> + <File + RelativePath=".\cameraOps.h"> + </File> + <File + RelativePath=".\sqVirtualMachine.h"> + </File> + </Filter> + <File + RelativePath=".\STRMBASE.lib"> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: trunk/platforms/win32/plugins/CameraPlugin/DirectShow BaseClasses project/baseclasses.sln =================================================================== --- trunk/platforms/win32/plugins/CameraPlugin/DirectShow BaseClasses project/baseclasses.sln (rev 0) +++ trunk/platforms/win32/plugins/CameraPlugin/DirectShow BaseClasses project/baseclasses.sln 2010-05-28 20:36:27 UTC (rev 2211) @@ -0,0 +1,27 @@ +Microsoft Visual Studio Solution File, Format Version 7.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "baseclasses.vcproj", "{C14D9535-35E5-4B7F-8614-B772A214EB0B}" +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + ConfigName.0 = Debug + ConfigName.1 = Debug Unicode + ConfigName.2 = Release + ConfigName.3 = Release Unicode + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {C14D9535-35E5-4B7F-8614-B772A214EB0B}.Debug.ActiveCfg = Debug|Win32 + {C14D9535-35E5-4B7F-8614-B772A214EB0B}.Debug.Build.0 = Debug|Win32 + {C14D9535-35E5-4B7F-8614-B772A214EB0B}.Debug Unicode.ActiveCfg = Debug Unicode|Win32 + {C14D9535-35E5-4B7F-8614-B772A214EB0B}.Debug Unicode.Build.0 = Debug Unicode|Win32 + {C14D9535-35E5-4B7F-8614-B772A214EB0B}.Release.ActiveCfg = Release|Win32 + {C14D9535-35E5-4B7F-8614-B772A214EB0B}.Release.Build.0 = Release|Win32 + {C14D9535-35E5-4B7F-8614-B772A214EB0B}.Release Unicode.ActiveCfg = Release Unicode|Win32 + {C14D9535-35E5-4B7F-8614-B772A214EB0B}.Release Unicode.Build.0 = Release Unicode|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Added: trunk/platforms/win32/plugins/CameraPlugin/DirectShow BaseClasses project/baseclasses.vcproj =================================================================== --- trunk/platforms/win32/plugins/CameraPlugin/DirectShow BaseClasses project/baseclasses.vcproj (rev 0) +++ trunk/platforms/win32/plugins/CameraPlugin/DirectShow BaseClasses project/baseclasses.vcproj 2010-05-28 20:36:27 UTC (rev 2211) @@ -0,0 +1,413 @@ +<?xml version="1.0" encoding = "Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.00" + Name="BaseClasses" + SccProjectName="" + SccLocalPath=""> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=".,..\..\..\..\include" + PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_WIN32_DCOM,WINVER=0x400" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="streams.h" + PrecompiledHeaderFile=".\Release/baseclasses.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + CallingConvention="2" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + AdditionalOptions="..\..\..\..\lib\strmiids.lib /nodefaultlib " + OutputFile="Release\STRMBASE.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG,WIN32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + </Configuration> + <Configuration + Name="Debug Unicode|Win32" + OutputDirectory=".\Debug_Unicode" + IntermediateDirectory=".\Debug_Unicode" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".,..\..\..\..\include" + PreprocessorDefinitions="_DEBUG,_MBCS,_LIB,_WIN32_DCOM,DEBUG,WINVER=0x400,WIN32,UNICODE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="streams.h" + PrecompiledHeaderFile=".\Debug_Unicode/baseclasses.pch" + AssemblerListingLocation=".\Debug_Unicode/" + ObjectFile=".\Debug_Unicode/" + ProgramDataBaseFileName=".\Debug_Unicode/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + DebugInformationFormat="3" + CallingConvention="2" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + AdditionalOptions="..\..\..\..\lib\strmiids.lib /nodefaultlib " + OutputFile="Debug_Unicode\strmbasd.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG,WIN32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + </Configuration> + <Configuration + Name="Release Unicode|Win32" + OutputDirectory=".\Release_Unicode" + IntermediateDirectory=".\Release_Unicode" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="1"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=".,..\..\..\..\include" + PreprocessorDefinitions="NDEBUG,_MBCS,_LIB,_WIN32_DCOM,WINVER=0x400,WIN32,UNICODE" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="streams.h" + PrecompiledHeaderFile=".\Release_Unicode/baseclasses.pch" + AssemblerListingLocation=".\Release_Unicode/" + ObjectFile=".\Release_Unicode/" + ProgramDataBaseFileName=".\Release_Unicode/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + CallingConvention="2" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + AdditionalOptions="..\..\..\..\lib\strmiids.lib /nodefaultlib " + OutputFile="Release_Unicode\STRMBASE.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG,WIN32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".,..\..\..\..\include" + PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_WIN32_DCOM,DEBUG,WINVER=0x400" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="streams.h" + PrecompiledHeaderFile=".\Debug/baseclasses.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + DebugInformationFormat="3" + CallingConvention="2" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + AdditionalOptions="..\..\..\..\lib\strmiids.lib /nodefaultlib " + OutputFile="debug\strmbasd.lib" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG,WIN32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + </Configuration> + </Configurations> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + <File + RelativePath=".\amextra.cpp"> + </File> + <File + RelativePath=".\amfilter.cpp"> + </File> + <File + RelativePath=".\amvideo.cpp"> + </File> + <File + RelativePath=".\combase.cpp"> + </File> + <File + RelativePath=".\cprop.cpp"> + </File> + <File + RelativePath=".\ctlutil.cpp"> + </File> + <File + RelativePath=".\ddmm.cpp"> + </File> + <File + RelativePath=".\dllentry.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1"/> + </FileConfiguration> + <FileConfiguration + Name="Debug Unicode|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1"/> + </FileConfiguration> + <FileConfiguration + Name="Release Unicode|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1"/> + </FileConfiguration> + </File> + <File + RelativePath=".\dllsetup.cpp"> + </File> + <File + RelativePath=".\mtype.cpp"> + </File> + <File + RelativePath=".\outputq.cpp"> + </File> + <File + RelativePath=".\pstream.cpp"> + </File> + <File + RelativePath=".\pullpin.cpp"> + </File> + <File + RelativePath=".\refclock.cpp"> + </File> + <File + RelativePath=".\renbase.cpp"> + </File> + <File + RelativePath=".\schedule.cpp"> + </File> + <File + RelativePath=".\seekpt.cpp"> + </File> + <File + RelativePath=".\source.cpp"> + </File> + <File + RelativePath=".\strmctl.cpp"> + </File> + <File + RelativePath=".\sysclock.cpp"> + </File> + <File + RelativePath=".\transfrm.cpp"> + </File> + <File + RelativePath=".\transip.cpp"> + </File> + <File + RelativePath=".\videoctl.cpp"> + </File> + <File + RelativePath=".\vtrans.cpp"> + </File> + <File + RelativePath=".\winctrl.cpp"> + </File> + <File + RelativePath=".\winutil.cpp"> + </File> + <File + RelativePath=".\wxdebug.cpp"> + </File> + <File + RelativePath=".\wxlist.cpp"> + </File> + <File + RelativePath=".\wxutil.cpp"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl"> + <File + RelativePath=".\activex.rcv"> + </File> + <File + RelativePath=".\activex.ver"> + </File> + <File + RelativePath=".\dllsetup.h"> + </File> + <File + RelativePath=".\dsschedule.h"> + </File> + <File + RelativePath=".\fourcc.h"> + </File> + <File + RelativePath=".\measure.h"> + </File> + <File + RelativePath=".\msgthrd.h"> + </File> + <File + RelativePath=".\mtype.h"> + </File> + <File + RelativePath=".\outputq.h"> + </File> + <File + RelativePath=".\pstream.h"> + </File> + <File + RelativePath=".\pullpin.h"> + </File> + <File + RelativePath=".\refclock.h"> + </File> + <File + RelativePath=".\reftime.h"> + </File> + <File + RelativePath=".\renbase.h"> + </File> + <File + RelativePath=".\seekpt.h"> + </File> + <File + RelativePath=".\source.h"> + </File> + <File + RelativePath=".\streams.h"> + </File> + <File + RelativePath=".\strmctl.h"> + </File> + <File + RelativePath=".\sysclock.h"> + </File> + <File + RelativePath=".\transfrm.h"> + </File> + <File + RelativePath=".\transip.h"> + </File> + <File + RelativePath=".\videoctl.h"> + </File> + <File + RelativePath=".\vtrans.h"> + </File> + <File + RelativePath=".\winctrl.h"> + </File> + <File + RelativePath=".\winutil.h"> + </File> + <File + RelativePath=".\wxdebug.h"> + </File> + <File + RelativePath=".\wxlist.h"> + </File> + <File + RelativePath=".\wxutil.h"> + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: trunk/platforms/win32/plugins/CameraPlugin/STRMBASE.lib =================================================================== (Binary files differ) Property changes on: trunk/platforms/win32/plugins/CameraPlugin/STRMBASE.lib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/platforms/win32/plugins/CameraPlugin/cameraOps.h =================================================================== --- trunk/platforms/win32/plugins/CameraPlugin/cameraOps.h (rev 0) +++ trunk/platforms/win32/plugins/CameraPlugin/cameraOps.h 2010-05-28 20:36:27 UTC (rev 2211) @@ -0,0 +1,10 @@ +extern "C" { + +int CameraOpen(int cameraNum, int desiredWidth, int desiredHeight); +void CameraClose(int cameraNum); +int CameraExtent(int cameraNum); +int CameraGetFrame(int cameraNum, unsigned char* buf, int pixelCount); +char* CameraName(int cameraNum); +int CameraGetParam(int cameraNum, int paramNum); + +} \ No newline at end of file Added: trunk/platforms/win32/plugins/CameraPlugin/sqVirtualMachine.h =================================================================== --- trunk/platforms/win32/plugins/CameraPlugin/sqVirtualMachine.h (rev 0) +++ trunk/platforms/win32/plugins/CameraPlugin/sqVirtualMachine.h 2010-05-28 20:36:27 UTC (rev 2211) @@ -0,0 +1,141 @@ +#ifndef _SqueakVM_H +#define _SqueakVM_H + +/* Increment the following number if you change the order of + functions listed or if you remove functions */ +#define VM_PROXY_MAJOR 1 + +/* Increment the following number if you add functions at the end */ +#define VM_PROXY_MINOR 1 + +typedef int (*CompilerHook)(); + +struct VirtualMachine* sqGetInterpreterProxy(void); + +typedef struct VirtualMachine { + int (*minorVersion) (void); + int (*majorVersion) (void); + + + /* InterpreterProxy methodsFor: 'stack access' */ + + int (*pop)(int nItems); + int (*popthenPush)(int nItems, int oop); + int (*push)(int object); + int (*pushBool)(int trueOrFalse); + int (*pushFloat)(double f); + int (*pushInteger)(int integerValue); + double (*stackFloatValue)(int offset); + int (*stackIntegerValue)(int offset); + int (*stackObjectValue)(int offset); + int (*stackValue)(int offset); + + + /* InterpreterProxy methodsFor: 'object access' */ + + int (*argumentCountOf)(int methodPointer); + void * (*arrayValueOf)(int oop); + int (*byteSizeOf)(int oop); + void * (*fetchArrayofObject)(int fieldIndex, int objectPointer); + int (*fetchClassOf)(int oop); + double (*fetchFloatofObject)(int fieldIndex, int objectPointer); + int (*fetchIntegerofObject)(int fieldIndex, int objectPointer); + int (*fetchPointerofObject)(int index, int oop); + int (*fetchWordofObject)(int fieldIndex, int oop); + void * (*firstFixedField)(int oop); + void * (*firstIndexableField)(int oop); + int (*literalofMethod)(int offset, int methodPointer); + int (*literalCountOf)(int methodPointer); + int (*methodArgumentCount)(void); + int (*methodPrimitiveIndex)(void); + int (*primitiveIndexOf)(int methodPointer); + int (*sizeOfSTArrayFromCPrimitive)(void *cPtr); + int (*slotSizeOf)(int oop); + int (*stObjectat)(int array, int index); + int (*stObjectatput)(int array, int index, int value); + int (*stSizeOf)(int oop); + int (*storeIntegerofObjectwithValue)(int index, int oop, int integer); + int (*storePointerofObjectwithValue)(int index, int oop, int valuePointer); + + + /* InterpreterProxy methodsFor: 'testing' */ + + int (*isKindOf)(int oop, char *aString); + int (*isMemberOf)(int oop, char *aString); + int (*isBytes)(int oop); + int (*isFloatObject)(int oop); + int (*isIndexable)(int oop); + int (*isIntegerObject)(int objectPointer); + int (*isIntegerValue)(int intValue); + int (*isPointers)(int oop); + int (*isWeak)(int oop); + int (*isWords)(int oop); + int (*isWordsOrBytes)(int oop); + + + /* InterpreterProxy methodsFor: 'converting' */ + + int (*booleanValueOf)(int obj); + int (*checkedIntegerValueOf)(int intOop); + int (*floatObjectOf)(double aFloat); + double (*floatValueOf)(int oop); + int (*integerObjectOf)(int value); + int (*integerValueOf)(int oop); + int (*positive32BitIntegerFor)(int integerValue); + int (*positive32BitValueOf)(int oop); + + + /* InterpreterProxy methodsFor: 'special objects' */ + + int (*characterTable)(void); + int (*displayObject)(void); + int (*falseObject)(void); + int (*nilObject)(void); + int (*trueObject)(void); + + + /* InterpreterProxy methodsFor: 'special classes' */ + + int (*classArray)(void); + int (*classBitmap)(void); + int (*classByteArray)(void); + int (*classCharacter)(void); + int (*classFloat)(void); + int (*classLargePositiveInteger)(void); + int (*classPoint)(void); + int (*classSemaphore)(void); + int (*classSmallInteger)(void); + int (*classString)(void); + + + /* InterpreterProxy methodsFor: 'instance creation' */ + + int (*clone)(int oop); + int (*instantiateClassindexableSize)(int classPointer, int size); + int (*makePointwithxValueyValue)(int xValue, int yValue); + int (*popRemappableOop)(void); + int (*pushRemappableOop)(int oop); + + + /* InterpreterProxy methodsFor: 'other' */ + + int (*becomewith)(int array1, int array2); + int (*byteSwapped)(int w); + int (*failed)(void); + int (*fullDisplayUpdate)(void); + int (*fullGC)(void); + int (*incrementalGC)(void); + int (*primitiveFail)(void); + int (*showDisplayBitsLeftTopRightBottom)(int aForm, int l, int t, int r, int b); + int (*signalSemaphoreWithIndex)(int semaIndex); + int (*success)(int aBoolean); + int (*superclassOf)(int classPointer); + + /* InterpreterProxy methodsFor: 'compiler' */ + + CompilerHook *(*compilerHookVector)(void); + int (*setCompilerInitialized)(int initFlag); + +} VirtualMachine; + +#endif /* _SqueakVM_H */ Added: trunk/platforms/win32/plugins/CameraPlugin/winCameraOps.cpp =================================================================== --- trunk/platforms/win32/plugins/CameraPlugin/winCameraOps.cpp (rev 0) +++ trunk/platforms/win32/plugins/CameraPlugin/winCameraOps.cpp 2010-05-28 20:36:27 UTC (rev 2211) @@ -0,0 +1,476 @@ +#include <windows.h> + +#include <atlbase.h> +#include <dshow.h> +#include <stdio.h> +#include <qedit.h> + +extern "C" { +#include "cameraOps.h" +} + +////////////////////////////////////////////// +// Sample Grabber Class +////////////////////////////////////////////// + +class CSampleGrabberCB : public ISampleGrabberCB { +public: + int frameCount; // number of frames received since last GetFrame() call + long lFrameBufSize; // size of buffer + BYTE *pFrameBuf; + + // fake out any COM ref counting + STDMETHODIMP_(ULONG) AddRef() { return 2; } + STDMETHODIMP_(ULONG) Release() + { + frameCount = 0; + lFrameBufSize = 0; + pFrameBuf = NULL; + return 1; + } + + // fake out any COM QI'ing + STDMETHODIMP QueryInterface(REFIID riid, void ** ppv) + { + if (riid == IID_ISampleGrabberCB || riid == IID_IUnknown) { + *ppv = (void *) static_cast<ISampleGrabberCB*> (this); + return NOERROR; + } + return E_NOINTERFACE; + } + + STDMETHODIMP SampleCB(double SampleTime, IMediaSample * pSample) { return 0; } // noop + + STDMETHODIMP BufferCB(double dblThisSampleTime, BYTE * pThisBuf, long lThisBufSize) + { + if ((pThisBuf == NULL) || (lThisBufSize == 0)) return E_POINTER; + + // if the buffer sizes don't match, discard ours to force creating a new one + if (lFrameBufSize != lThisBufSize) { + lFrameBufSize = 0; + delete [] pFrameBuf; + pFrameBuf = NULL; + } + + // if we haven't yet created the data buffer, do it now. + if (!pFrameBuf) { + pFrameBuf = new BYTE[lThisBufSize]; + lFrameBufSize = lThisBufSize; + if (!pFrameBuf) lFrameBufSize = 0; + } + + // Copy the bitmap data into our global buffer + if (pFrameBuf) memcpy(pFrameBuf, pThisBuf, lFrameBufSize); + frameCount++; + + return 0; + } +}; + +////////////////////////////////////////////// +// Data +////////////////////////////////////////////// + +typedef struct Camera { + IBaseFilter *pCamera; + IGraphBuilder *pGraph; + ICaptureGraphBuilder2 *pCapture; + IMediaControl *pMediaControl; + IBaseFilter *ppf; + ISampleGrabber *pGrabber; + CSampleGrabberCB mCB; + int width; + int height; +} Camera; + +#define CAMERA_COUNT 8 +Camera theCamera; + +////////////////////////////////////////////// +// Local functions and macros +////////////////////////////////////////////// + +int CameraIsOpen(); +void FindBestWidth(IAMStreamConfig *pCameraStream, int desiredWidth); +HRESULT FindCamera(IBaseFilter ** ppSrcFilter, int num); +void FreeMediaType(AM_MEDIA_TYPE *pMediaType); +void FreeMediaTypeFields(AM_MEDIA_TYPE *pMediaType); +char* GetCameraName(int num); +HRESULT InitCamera(int num, int desiredWidth); +void Msg(TCHAR *szFormat, ...); +void SetCameraWidth(ICaptureGraphBuilder2 *pCaptureGraphBuilder, IBaseFilter *pSrcFilter, int desiredWidth); +void SetOutputToRGB(void); + +#define SAFE_RELEASE(x) { if (x) x->Release(); x = NULL; } + +////////////////////////////////////////////// +// Entry Points +////////////////////////////////////////////// + +int CameraOpen(int cameraNum, int desiredWidth, int desiredHeight) +{ + CameraClose(cameraNum); + int hr = InitCamera(cameraNum, desiredWidth); + return SUCCEEDED(hr); +} + +void CameraClose(int cameraNum) +{ + if (!CameraIsOpen()) return; + + // stop getting video + if (theCamera.pMediaControl) theCamera.pMediaControl->StopWhenReady(); + + // release DirectShow objects + SAFE_RELEASE(theCamera.pMediaControl); + SAFE_RELEASE(theCamera.pGraph); + SAFE_RELEASE(theCamera.pCapture); + SAFE_RELEASE(theCamera.pGrabber); + SAFE_RELEASE(theCamera.ppf); + SAFE_RELEASE(theCamera.pCamera); + theCamera.width = theCamera.height = 0; +} + +int CameraExtent(int cameraNum) +{ + if (!CameraIsOpen()) return 0; + + return (theCamera.width << 16) + theCamera.height; +} + +int CameraGetFrame(int cameraNum, unsigned char* buf, int pixelCount) +{ + if (!CameraIsOpen()) return -1; + + int framesSinceLastCall = theCamera.mCB.frameCount; + if (framesSinceLastCall == 0) return 0; // no frame available + theCamera.mCB.frameCount = 0; // clear frame count + + if (pixelCount > (theCamera.mCB.lFrameBufSize / 3)) pixelCount = (theCamera.mCB.lFrameBufSize / 3); + + // flip image vertically while copying to Squeak buf + unsigned char* pSrc = theCamera.mCB.pFrameBuf; + for (int y = theCamera.height - 1; y >= 0; y--) { + unsigned char* pDst = &buf[4 * y * theCamera.width]; + for (int x = 0; x < theCamera.width; x++) { + *pDst++ = *pSrc++; // red + *pDst++ = *pSrc++; // green + *pDst++ = *pSrc++; // blue + *pDst++ = 255; // alpha + } + } + + return framesSinceLastCall; +} + +char* CameraName(int cameraNum) +{ + if ((cameraNum < 1) || (cameraNum > CAMERA_COUNT)) return NULL; + return GetCameraName(cameraNum); +} + +int CameraGetParam(int cameraNum, int paramNum) // for debugging and testing +{ + if (!CameraIsOpen()) return -1; + if (paramNum == 1) return theCamera.mCB.frameCount; + if (paramNum == 2) return theCamera.mCB.lFrameBufSize; + + return -2; +} + +////////////////////////////////////////////// +// Local functions +////////////////////////////////////////////// + +int CameraIsOpen() +{ + return theCamera.mCB.pFrameBuf != NULL; +} + +HRESULT FindCamera(IBaseFilter ** ppSrcFilter, int cameraNum) +{ + HRESULT hr; + IBaseFilter *pSrc = NULL; + CComPtr <IMoniker> pMoniker = NULL; + ULONG cFetched; + + if (!ppSrcFilter) return E_POINTER; + + *ppSrcFilter = NULL; // clear output in case we return early with an error + + // Create system device enumerator + CComPtr <ICreateDevEnum> pDevEnum = NULL; + hr = CoCreateInstance( + CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + IID_ICreateDevEnum, (void **) &pDevEnum); + if (FAILED(hr)) return hr; + + // Create enumerator for the video capture devices + CComPtr <IEnumMoniker> pClassEnum = NULL; + hr = pDevEnum->CreateClassEnumerator (CLSID_VideoInputDeviceCategory, &pClassEnum, 0); + if (FAILED(hr)) return hr; + + // If there are no enumerators for the requested type, then + // CreateClassEnumerator will succeed, but pClassEnum will be NULL. + if (pClassEnum == NULL) return E_FAIL; + + // Find the nth video capture device on the device list. + // Note that if the Next() call succeeds but there are no monikers, + // it will return S_FALSE (which is not a failure). Therefore, we + // check that the return code is S_OK instead of using SUCCEEDED() macro + for (int i = 1; i <= cameraNum; i++) { + if (S_OK != pClassEnum->Next (1, &pMoniker, &cFetched)) return E_FAIL; + } + + // Bind Moniker to a filter object + hr = pMoniker->BindToObject(0, 0, IID_IBaseFilter, (void**) &pSrc); + if (FAILED(hr)) return hr; + + // Copy the found filter pointer to the output parameter. + // Do NOT Release() the reference, since it will still be used + // by the calling function. + *ppSrcFilter = pSrc; + return hr; +} + +void FreeMediaType(AM_MEDIA_TYPE *pMediaType) // free fields and structure +{ + if (!pMediaType) return; + FreeMediaTypeFields(pMediaType); + CoTaskMemFree((void *) pMediaType); +} + +void FreeMediaTypeFields(AM_MEDIA_TYPE *pMediaType) // free format and pUnk fields +{ + if (pMediaType->cbFormat != 0) { + CoTaskMemFree((PVOID) pMediaType->pbFormat); + pMediaType->cbFormat = 0; + pMediaType->pbFormat = NULL; + } + if (pMediaType->pUnk != NULL) { + // pUnk should be unused, but this is safest + pMediaType->pUnk->Release(); + pMediaType->pUnk = NULL; + } +} + +char* GetCameraName(int cameraNum) +{ + CComPtr <ICreateDevEnum> pDevEnum = NULL; + CComPtr <IEnumMoniker> pClassEnum = NULL; + CComPtr <IMoniker> pMoniker = NULL; + IPropertyBag* pPropBag; + VARIANT varName; + HRESULT hr; + ULONG cFetched; + char* result = NULL; + + // Create the system device enumerator + hr = CoCreateInstance( + CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + IID_ICreateDevEnum, (void **) &pDevEnum); + if (FAILED(hr)) return NULL; + + // Create an enumerator for the video capture devices + hr = pDevEnum->CreateClassEnumerator(CLSID_VideoInputDeviceCategory, &pClassEnum, 0); + if (FAILED(hr)) return NULL; + + // If there are no enumerators for the requested type, then + // CreateClassEnumerator will succeed, but pClassEnum will be NULL. + if (pClassEnum == NULL) return NULL; + + // Note that if the Next() call succeeds but there are no monikers, + // it will return S_FALSE, which is not a failure. Therefore, we check + // that the return code is S_OK instead of using the SUCCEEDED() macro. + for (int i = 0; i < cameraNum; i++) { + hr = pClassEnum->Next(1, &pMoniker, &cFetched); + if (hr != S_OK) return NULL; + } + + hr = pMoniker->BindToStorage(0, 0, IID_IPropertyBag, (void**)(&pPropBag)); + + // Find the description or friendly name + VariantInit(&varName); + hr = pPropBag->Read(L"Description", &varName, 0); + if (FAILED(hr)) { + hr = pPropBag->Read(L"FriendlyName", &varName, 0); + } + + if (SUCCEEDED(hr)) { + int n = SysStringLen(varName.bstrVal); + result = new char[n + 1]; + for (int i = 0; i < n; i++) { + result[i] = (char) varName.bstrVal[i]; + } + result[n] = 0; + VariantClear(&varName); + } + + pPropBag->Release(); + return result; +} + +HRESULT InitCamera(int num, int desiredWidth) +{ + HRESULT hr; + + // get USB camera or other video capture device + hr = FindCamera(&theCamera.pCamera, num); + if (FAILED(hr)) return hr; + + // create filter graph + hr = CoCreateInstance ( + CLSID_FilterGraph, NULL, CLSCTX_INPROC, + IID_IGraphBuilder, (void **) &theCamera.pGraph); + if (FAILED(hr)) return hr; + + // create capture graph builder + hr = CoCreateInstance ( + CLSID_CaptureGraphBuilder2 , NULL, CLSCTX_INPROC, + IID_ICaptureGraphBuilder2, (void **) &theCamera.pCapture); + if (FAILED(hr)) return hr; + + // get media control interface + hr = theCamera.pGraph->QueryInterface(IID_IMediaControl,(LPVOID *) &theCamera.pMediaControl); + if (FAILED(hr)) return hr; + + // create SampleGrabber + hr = CoCreateInstance( + CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, + IID_IBaseFilter, (void**) &theCamera.ppf); + if (FAILED(hr)) return hr; + + theCamera.ppf->QueryInterface(IID_ISampleGrabber, (void**) &theCamera.pGrabber); + + // attach the filter graph to the capture graph + hr = theCamera.pCapture->SetFiltergraph(theCamera.pGraph); + if (FAILED(hr)) return hr; + + hr = theCamera.pGraph->AddFilter(theCamera.ppf, L"Scratch Frame Grabber"); + if (FAILED(hr)) return hr; + + // add the camera + hr = theCamera.pGraph->AddFilter(theCamera.pCamera, L"Camera"); + if (FAILED(hr)) return hr; + + // set the desired framesize and image format + SetCameraWidth(theCamera.pCapture, theCamera.pCamera, desiredWidth); + SetOutputToRGB(); + + // connect the camera to the sample grabber, possibly inserting format conversion filters + hr = theCamera.pCapture->RenderStream( + &PIN_CATEGORY_CAPTURE, &MEDIATYPE_Video, + theCamera.pCamera, NULL, theCamera.ppf); + + // record the actual camera frame dimensions + AM_MEDIA_TYPE mt; + hr = theCamera.pGrabber->GetConnectedMediaType(&mt); + if (FAILED(hr)) return hr; + + theCamera.width = ((VIDEOINFOHEADER*) mt.pbFormat)->bmiHeader.biWidth; + theCamera.height = ((VIDEOINFOHEADER*) mt.pbFormat)->bmiHeader.biHeight; + FreeMediaTypeFields(&mt); + + hr = theCamera.pGrabber->SetOneShot(FALSE); + hr = theCamera.pGrabber->SetBufferSamples(FALSE); + hr = theCamera.pGrabber->SetCallback(&theCamera.mCB, 1); + + // start getting video + hr = theCamera.pMediaControl->Run(); + if (FAILED(hr)) return hr; + + return S_OK; +} + +void SetOutputToRGB() { + AM_MEDIA_TYPE mediaType; + mediaType.majortype = MEDIATYPE_Video; + mediaType.subtype = MEDIASUBTYPE_RGB24; + mediaType.formattype = GUID_NULL; + mediaType.pbFormat = NULL; + mediaType.cbFormat = 0; + theCamera.pGrabber->SetMediaType(&mediaType); +} + +void SetCameraWidth(ICaptureGraphBuilder2 *pCaptureGraphBuilder, IBaseFilter *pSrcFilter, int desiredWidth) +{ + IAMStreamConfig *pCameraStream = NULL; + HRESULT hr; + + // get the stream configuration interface + hr = pCaptureGraphBuilder->FindInterface( + &PIN_CATEGORY_CAPTURE, 0, pSrcFilter, + IID_IAMStreamConfig, (void**) &pCameraStream); + if (FAILED(hr)) return; + + FindBestWidth(pCameraStream, desiredWidth); + + SAFE_RELEASE(pCameraStream); +} + +void FindBestWidth(IAMStreamConfig *pCameraStream, int desiredWidth) +{ + int iCount = 0, iSize = 0; + int bestWidth = 1000000; + AM_MEDIA_TYPE *selectedMediaType = NULL; + HRESULT hr; + + // iterate through all possible camera frame formats to find the best frame size + hr = pCameraStream->GetNumberOfCapabilities(&iCount, &iSize); + for (int i = 0; i < iCount; i++) { + AM_MEDIA_TYPE *thisMediaType = NULL; + VIDEO_STREAM_CONFIG_CAPS scc; + hr = pCameraStream->GetStreamCaps(i, &thisMediaType, (BYTE*) &scc); + if (SUCCEEDED(hr)) { + if ((thisMediaType->majortype == MEDIATYPE_Video) && + (thisMediaType->formattype == FORMAT_VideoInfo) && + (thisMediaType->cbFormat >= sizeof (VIDEOINFOHEADER)) && + (thisMediaType->pbFormat != NULL)) + { + VIDEOINFOHEADER* info = (VIDEOINFOHEADER*) thisMediaType->pbFormat; + int thisWidth = info->bmiHeader.biWidth; + if (abs(thisWidth - desiredWidth) < abs(bestWidth - desiredWidth)) { + // select the format closest to the desired width + if (!selectedMediaType) FreeMediaType(selectedMediaType); + selectedMediaType = thisMediaType; + bestWidth = thisWidth; + } + } + + // Delete the media type unless it's the selected one + if (thisMediaType != selectedMediaType) FreeMediaType(thisMediaType); + thisMediaType = NULL; + } + } + + // if we found a matching format, set the camera to that format + if (selectedMediaType) { + hr = pCameraStream->SetFormat(selectedMediaType); + FreeMediaType(selectedMediaType); + } +} + +////////////////////////////////////////////// +// Debugging function +////////////////////////////////////////////// + +void Msg(TCHAR *szFormat, ...) +{ + TCHAR szBuffer[1024]; // Large buffer for long filenames or URLs + const size_t NUMCHARS = sizeof(szBuffer) / sizeof(szBuffer[0]); + const int LASTCHAR = NUMCHARS - 1; + + // Format the input string + va_list pArgs; + va_start(pArgs, szFormat); + + // Use a bounded buffer size to prevent buffer overruns. Limit count to + // character size minus one to allow for a NULL terminating character. + _vsntprintf(szBuffer, NUMCHARS - 1, szFormat, pArgs); + va_end(pArgs); + + // Ensure that the formatted string is NULL-terminated + szBuffer[LASTCHAR] = TEXT('\0'); + + MessageBox(NULL, szBuffer, TEXT("Debug"), 0); +}

1 0

VM Maker: VMMaker-dtl.177.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 28 May '10

28 May '10

Dave Lewis uploaded a new version of VMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/VMMaker-dtl.177.mcz ==================== Summary ==================== Name: VMMaker-dtl.177 Author: dtl Time: 27 May 2010, 9:59:27 am UUID: 27692d97-0397-4abd-a917-b37879bec3c1 Ancestors: VMMaker-dtl.176 VMMaker 4.2.3 Remove the "64-bit image" checkbox from VMMakerTool user interface. Change default source directory for generated sources to src (not src32 or src64). Remove 32/64 bit word size methods and variables from VMMaker and VMMakerTool. Building a VM for a 64-bit image is now controlled by the compile time macro SQ_VI_BYTES_PER_WORD. If not defined, the macro is set to 4 to support a standard 32-bit image. =============== Diff against VMMaker-dtl.176 =============== Item was changed: ----- Method: VMMaker>>sourceDirectory (in category 'target directories') ----- sourceDirectory | fd | + fd := FileDirectory default + directoryNamed: (sourceDirName + ifNil: [self class sourceDirName]). - fd := FileDirectory default directoryNamed: (sourceDirName - ifNil: [self class sourceDirName, self vmBitnessString]). fd assureExistence. ^ fd! Item was changed: + ----- Method: VMMakerTool>>toggle64BitVM (in category 'deprecated') ----- - ----- Method: VMMakerTool>>toggle64BitVM (in category 'settings') ----- toggle64BitVM + "This selector may be used by obsolete instances of VMMakerTool. The + 64-bit setting of VMMaker is no longer functionally relevant, but this method + is retained to prevent problems with existing VMMakerTool instances that + may exist in some images."! - self set64BitVM: self isFor64BitVM not! Item was changed: ----- Method: VMMakerTool>>addSecondButtonRowToWindow:startingAt: (in category 'window construction') ----- addSecondButtonRowToWindow: sysWin startingAt: initialVerticalOffset | verticalOffset box | verticalOffset := initialVerticalOffset. "add a row of buttons to start up various actions" box := AlignmentMorph new vResizing: #shrinkWrap; layoutInset: 6@3; cellInset: 6@0; wrapCentering: #center. box addMorph: (TextMorph new contents: 'Generate:' translated asText allBold) lock. box addMorphBack: (SimpleButtonMorph new target: self; label: 'Entire'; actionSelector: #generateAll; hResizing: #spaceFill; setBalloonText: 'Generate the sources for the core VM and all chosen internal and external plugins'). box addMorphBack: (SimpleButtonMorph new target: self; label: 'Core+Internal'; actionSelector: #generateCore; hResizing: #spaceFill; setBalloonText: 'Generate the sources for the core vm and any internal plugins'). box addMorphBack: (SimpleButtonMorph new target: self; label: 'External Plugins'; actionSelector: #generateExternal; hResizing: #spaceFill; setBalloonText: 'Generate the sources for all external plugins'). - box addMorphBack: ((AlignmentMorph inARow: {StringMorph new contents: '64-bit image'. UpdatingThreePhaseButtonMorph checkBox target: self; - actionSelector: #toggle64BitVM; - getSelector: #isFor64BitVM}) layoutInset: 3; - cellInset: 5; - color: Color blue veryMuchLighter; - setBalloonText: 'Build (32- or 64-bit) VM to run 64-bit images. Default is false to support normal 32-bit images.' yourself). sysWin addMorph: box fullFrame: (LayoutFrame fractions: (0 @ 0 corner: 1 @ 0) offsets: (0 @ verticalOffset corner: 0 @ (verticalOffset := verticalOffset + box height - 1))). ^verticalOffset.! Item was added: + ----- Method: CCodeGenerator>>emitDefineBytesPerWordOn: (in category 'C code generator') ----- + emitDefineBytesPerWordOn: aStream + "Define word size dependent constants. These are mirrored by class + variables in ObjectMemory. The macro definitions here are used at compile + time to permit building a VM for either 32-bit or 64-bit object memory from + a single generated code base. + + If SQ_VI_BYTES_PER_WORD is defined as 8 (e.g. in config.h), then a VM for + 64-bit image will be built. Otherwise, a VM for 32-bit image is built." + + aStream cr; + nextPutAll: '/*'; cr; + nextPutAll: ' * define SQ_VI_BYTES_PER_WORD 8 for a 64-bit word size VM'; cr; + nextPutAll: ' * and default to SQ_VI_BYTES_PER_WORD 4 for a 32-bit word size VM'; cr; + nextPutAll: ' */'; cr; + nextPutAll: '#ifndef SQ_VI_BYTES_PER_WORD'; cr; + nextPutAll: '# define SQ_VI_BYTES_PER_WORD '; + print: 4; cr; "default to word size 4" + nextPutAll: '#endif'; cr; cr; + nextPutAll: '#define BYTES_PER_WORD SQ_VI_BYTES_PER_WORD'; cr; + nextPutAll: '#define BASE_HEADER_SIZE SQ_VI_BYTES_PER_WORD'; cr; + + "Define various constants that depend on BytesPerWord" + nextPutAll: '#if (BYTES_PER_WORD == 4) // 32-bit object memory'; cr; + nextPutAll: '# define WORD_MASK 0xffffffff'; cr; "(1 bitShift: BytesPerWord*8) - 1" + nextPutAll: '# define SHIFT_FOR_WORD 2'; cr; "(BytesPerWord log: 2) rounded" + nextPutAll: '# define SMALL_CONTEXT_SIZE 92'; cr; "ContextFixedSizePlusHeader + 16 * BytesPerWord" + "Large contexts have 56 indexable fileds. Max with single header word." + "However note that in 64 bits, for now, large contexts have 3-word headers" + nextPutAll: '# define LARGE_CONTEXT_SIZE 252'; cr; "ContextFixedSizePlusHeader + 56 * BytesPerWord." + nextPutAll: '# define SIZE_MASK 0xfc'; cr; "Base header word bit field" + nextPutAll: '# define LONG_SIZE_MASK 0xfffffffc'; cr; "Base header word bit field" + nextPutAll: '# define SIZE_4_BIT 0'; cr; + nextPutAll: '# define MARK_BIT 0x80000000'; cr; "Top bit, 1 bitShift: BytesPerWord*8 - 1" + nextPutAll: '# define ROOT_BIT 0x40000000'; cr; "Next-to-top bit, 1 bitShift: BytesPerWord*8 - 2" + nextPutAll: '# define ALL_BUT_MARK_BIT 0x7fffffff'; cr; "WordMask - MarkBit." + nextPutAll: '# define ALL_BUT_ROOT_BIT 0xbfffffff'; cr; "WordMask - RootBit" + nextPutAll: '# define ALL_BUT_TYPE_MASK 0xfffffffc'; cr; "WordMask - TypeMask" + nextPutAll: '# define ALL_BUT_MARK_BIT_AND_TYPE_MASK 0x7ffffffc'; cr; "AllButTypeMask - MarkBit" + nextPutAll: '# define ALL_BUT_HASH_BITS 0xe001ffff'; cr; + + nextPutAll: '#else // 64-bit object memory'; cr; + nextPutAll: '# define WORD_MASK 0xffffffffffffffff'; cr; + nextPutAll: '# define SHIFT_FOR_WORD 3'; cr; + nextPutAll: '# define SMALL_CONTEXT_SIZE 184'; cr; + nextPutAll: '# define LARGE_CONTEXT_SIZE 504'; cr; + nextPutAll: '# define SIZE_MASK 0xf8'; cr; "Lose the 4 bit in temp 64-bit chunk format" + nextPutAll: '# define LONG_SIZE_MASK 0xfffffffffffffff8'; cr; + "The 4 bit is excluded from SIZE_MASK for 64-bit object memory, but need it" + "for ST size, so define SIZE_4_BIT." + nextPutAll: '# define SIZE_4_BIT 4'; cr; + nextPutAll: '# define MARK_BIT 0x8000000000000000'; cr; + nextPutAll: '# define ROOT_BIT 0x4000000000000000'; cr; + nextPutAll: '# define ALL_BUT_MARK_BIT 0x7fffffffffffffff'; cr; + nextPutAll: '# define ALL_BUT_ROOT_BIT 0xbfffffffffffffff'; cr; + nextPutAll: '# define ALL_BUT_TYPE_MASK 0xfffffffffffffffc'; cr; + nextPutAll: '# define ALL_BUT_MARK_BIT_AND_TYPE_MASK 0x7ffffffffffffffc'; cr; + nextPutAll: '# define ALL_BUT_HASH_BITS 0xffffffffe001ffff'; cr; + nextPutAll: '#endif // (BYTES_PER_WORD == 4)'; cr + + ! Item was added: + ----- Method: ObjectMemory class>>initializeObjectWordConstants (in category 'initialization') ----- + initializeObjectWordConstants + + Byte0Shift := 0. + Byte1Shift := 8. + Byte2Shift := 16. + Byte3Shift := 24. + Byte4Shift := 32. + Byte5Shift := 40. + Byte6Shift := 48. + Byte7Shift := 56. + + Byte0Mask := 16r00000000000000FF. + Byte1Mask := 16r000000000000FF00. + Byte2Mask := 16r0000000000FF0000. + Byte3Mask := 16r00000000FF000000. + Byte4Mask := 16r000000FF00000000. + Byte5Mask := 16r0000FF0000000000. + Byte6Mask := 16r00FF000000000000. + Byte7Mask := 16rFF00000000000000. + Bytes3to0Mask := 16r00000000FFFFFFFF. + Bytes7to4Mask := 16rFFFFFFFF00000000. + + Byte1ShiftNegated := Byte1Shift negated. + Byte3ShiftNegated := Byte3Shift negated. + Byte4ShiftNegated := Byte4Shift negated. + Byte5ShiftNegated := Byte5Shift negated. + Byte7ShiftNegated := Byte7Shift negated! Item was changed: ----- Method: InterpreterSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the InterpreterSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." "initialize class variables" + ObjectMemory initializeConstants. - ObjectMemory initializeWithBytesToWord: self bytesPerWord. Interpreter initialize. "Note: we must initialize ConstMinusOne differently for simulation, due to the fact that the simulator works only with +ve 32-bit values" ConstMinusOne := self integerObjectOf: -1. methodCache := Array new: MethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. rootTable := Array new: RootTableSize. weakRoots := Array new: RootTableSize + RemapBufferSize + 100. remapBuffer := Array new: RemapBufferSize. semaphoresUseBufferA := true. semaphoresToSignalA := Array new: SemaphoresToSignalSize. semaphoresToSignalB := Array new: SemaphoresToSignalSize. externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). primitiveTable := self class primitiveTable. obsoleteNamedPrimitiveTable := CArrayAccessor on: (self class obsoleteNamedPrimitiveTable copyWith: (Array new: 3)). obsoleteIndexedPrimitiveTable := CArrayAccessor on: (self class obsoleteIndexedPrimitiveTable collect:[:spec| CArrayAccessor on: (spec ifNil:[Array new: 3] ifNotNil:[Array with: spec first with: spec second with: nil])]). pluginList := #(). mappedPluginEntries := #(). "initialize InterpreterSimulator variables used for debugging" byteCount := 0. sendCount := 0. quitBlock := [^ self]. traceOn := true. myBitBlt := BitBltSimulator new setInterpreter: self. filesOpen := OrderedCollection new. headerTypeBytes := CArrayAccessor on: (Array with: self bytesPerWord * 2 with: self bytesPerWord with: 0 with: 0). transcript := Transcript. displayForm := 'Display has not yet been installed' asDisplayText form. ! Item was changed: ----- Method: VMMaker>>generateInterpreterFile (in category 'generate sources') ----- generateInterpreterFile "Translate the Smalltalk description of the virtual machine into C. If 'self doInlining' is true, small method bodies are inlined to reduce procedure call overhead. On the PPC, this results in a factor of three speedup with only 30% increase in code size. Subclasses can use specialised versions of CCodeGenerator and interpreterClass." | cg | self needsToRegenerateInterpreterFile ifFalse: [^nil]. self interpreterClass initialize. + ObjectMemory initializeConstants. - ObjectMemory initializeWithBytesToWord: self bytesPerWord. cg := self createCodeGenerator addClass: self interpreterClass; addClass: ObjectMemory. (Smalltalk classNamed: #MemoryAccess) ifNotNilDo: [:ma | ma isEnabled ifTrue: [cg addClass: ma]]. + cg storeHeaderOnFile: self interpreterHeaderPath. - cg storeHeaderOnFile: self interpreterHeaderPath bytesPerWord: self bytesPerWord. cg storeCodeOnFile: self interpreterFilePath doInlining: self doInlining! Item was added: + ----- Method: ObjectMemory class>>initializeConstants (in category 'initialization') ----- + initializeConstants + "ObjectMemory initializeConstants" + + self initializeObjectWordConstants. + + "Translation flags (booleans that control code generation via conditional translation):" + DoAssertionChecks := false. "generate assertion checks" + DoBalanceChecks := false. "generate stack balance checks" + + self initializeSpecialObjectIndices. + self initializeObjectHeaderConstants. + + CtxtTempFrameStart := 6. "Copy of TempFrameStart in Interp" + ContextFixedSizePlusHeader := CtxtTempFrameStart + 1. + + LargeContextBit := 16r40000. "This bit set in method headers if large context is needed." + NilContext := 1. "the oop for the integer 0; used to mark the end of context lists" + + RemapBufferSize := 25. + RootTableSize := 2500. "number of root table entries (4 bytes/entry)" + RootTableRedZone := RootTableSize - 100. "red zone of root table - when reached we force IGC" + + "tracer actions" + StartField := 1. + StartObj := 2. + Upward := 3. + Done := 4. + + ExtraRootSize := 2048. "max. # of external roots"! Item was changed: ----- Method: VMMaker>>configurationInfo (in category 'objects from disk') ----- configurationInfo "build a simple Array of the configuration information that would be usefully saved for later reloading:- the list of internal & external plugins, the flags, the platform name, and the two major directory names" ^ Array new writeStream nextPut: internalPlugins; nextPut: externalPlugins; nextPut: inline; nextPut: forBrowser; nextPut: self platformName; nextPut: self sourceDirectory pathName; nextPut: self platformRootDirectory pathName; - nextPut: self bytesPerWord; contents! Item was added: + ----- Method: CCodeGenerator>>storeHeaderOnFile: (in category 'public') ----- + storeHeaderOnFile: fileName + "Store C header code for this interpreter on the given file." + + | aStream | + aStream := CrLfFileStream forceNewFileNamed: fileName. + aStream ifNil: [Error signal: 'Could not open C header file: ', fileName]. + aStream + nextPutAll: '/* '; + nextPutAll: VMMaker headerNotice; + nextPutAll: ' */'; cr; cr. + self emitVmmVersionOn: aStream. + self emitDefineBytesPerWordOn: aStream. + self emitDefineMemoryAccessInImageOn: aStream. + aStream cr. + aStream close + ! Item was changed: (excessive method size, no diff calculated) Item was changed: + ----- Method: VMMakerTool>>isFor64BitVM (in category 'deprecated') ----- - ----- Method: VMMakerTool>>isFor64BitVM (in category 'generate sources') ----- isFor64BitVM + "This selector may be used by obsolete instances of VMMakerTool. The + 64-bit setting of VMMaker is no longer functionally relevant, but this method + is retained to prevent problems with existing VMMakerTool instances that + may exist in some images."! - "do I build a 64bit VM or not?" - ^vmMaker isFor64BitVM! Item was changed: ----- Method: VMMaker>>loadConfiguration: (in category 'objects from disk') ----- loadConfiguration: aConfigArray "load the configuration but ignore the platformName - the platform name must have been handled during the creation of this vmmaker in order for it to work correctly" inline := aConfigArray at:3. forBrowser := aConfigArray at: 4. "This part must be ignored --> self setPlatName: (aConfigArray at: 5)." self sourceDirectoryName: (aConfigArray at: 6). self platformRootDirectoryName: ( aConfigArray at:7). self initializeAllPlugins. self internal: (aConfigArray at:1) external:(aConfigArray at:2). aConfigArray size >7 ifTrue:["new enough to have 64bitness flag" + "But this flag is now ignored because code generation is the same for 32 and 64 bit images now" + "Note - reserve slot 7 for backward compatibility. Any new slots added should begin at 8"]. - (aConfigArray at:8) =8 ifTrue:[self for64BitVM]. - (aConfigArray at:8) =4 ifTrue:[self for32BitVM]]. self changed: #reinitialize ! Item was changed: ----- Method: VMMaker>>initialize (in category 'initialize') ----- initialize logger := Transcript. inline := true. forBrowser := false. internalPlugins := SortedCollection new. externalPlugins := SortedCollection new. platformName := self class machinesDirName. - is64BitVM := Smalltalk wordSize == 8. allFilesList := Dictionary new. interpreterClassName := Interpreter name! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.2.3'! - ^'4.2.2'! Item was removed: - ----- Method: ObjectMemory class>>initializeWithBytesToWord: (in category 'initialization') ----- - initializeWithBytesToWord: numberOfBytesInAWord - "ObjectMemory initializeWithBytesToWord: Smalltalk wordSize" - - self initBytesPerWord: numberOfBytesInAWord. - - "Translation flags (booleans that control code generation via conditional translation):" - DoAssertionChecks := false. "generate assertion checks" - DoBalanceChecks := false. "generate stack balance checks" - - self initializeSpecialObjectIndices. - self initializeObjectHeaderConstants. - - CtxtTempFrameStart := 6. "Copy of TempFrameStart in Interp" - ContextFixedSizePlusHeader := CtxtTempFrameStart + 1. - - LargeContextBit := 16r40000. "This bit set in method headers if large context is needed." - NilContext := 1. "the oop for the integer 0; used to mark the end of context lists" - - RemapBufferSize := 25. - RootTableSize := 2500. "number of root table entries (4 bytes/entry)" - RootTableRedZone := RootTableSize - 100. "red zone of root table - when reached we force IGC" - - "tracer actions" - StartField := 1. - StartObj := 2. - Upward := 3. - Done := 4. - - ExtraRootSize := 2048. "max. # of external roots"! Item was removed: - ----- Method: ObjectMemory class>>initBytesPerWord: (in category 'initialization') ----- - initBytesPerWord: unused - - Byte0Shift := 0. - Byte1Shift := 8. - Byte2Shift := 16. - Byte3Shift := 24. - Byte4Shift := 32. - Byte5Shift := 40. - Byte6Shift := 48. - Byte7Shift := 56. - - Byte0Mask := 16r00000000000000FF. - Byte1Mask := 16r000000000000FF00. - Byte2Mask := 16r0000000000FF0000. - Byte3Mask := 16r00000000FF000000. - Byte4Mask := 16r000000FF00000000. - Byte5Mask := 16r0000FF0000000000. - Byte6Mask := 16r00FF000000000000. - Byte7Mask := 16rFF00000000000000. - Bytes3to0Mask := 16r00000000FFFFFFFF. - Bytes7to4Mask := 16rFFFFFFFF00000000. - - Byte1ShiftNegated := Byte1Shift negated. - Byte3ShiftNegated := Byte3Shift negated. - Byte4ShiftNegated := Byte4Shift negated. - Byte5ShiftNegated := Byte5Shift negated. - Byte7ShiftNegated := Byte7Shift negated! Item was removed: - ----- Method: CCodeGenerator>>storeHeaderOnFile:bytesPerWord: (in category 'public') ----- - storeHeaderOnFile: fileName bytesPerWord: bytesPerWord - "Store C header code for this interpreter on the given file." - - | aStream | - aStream := CrLfFileStream forceNewFileNamed: fileName. - aStream ifNil: [Error signal: 'Could not open C header file: ', fileName]. - aStream - nextPutAll: '/* '; - nextPutAll: VMMaker headerNotice; - nextPutAll: ' */'; cr; cr. - self emitVmmVersionOn: aStream. - self emitDefineBytesPerWord: bytesPerWord on: aStream. - self emitDefineMemoryAccessInImageOn: aStream. - aStream cr. - aStream close - ! Item was removed: - ----- Method: VMMaker>>for32BitVM (in category 'initialize') ----- - for32BitVM - "set my flag to make a 32bit pointer model VM" - is64BitVM := false. - self changed: #sourcePathText.! Item was removed: - ----- Method: VMMaker>>vmBitnessString (in category 'target directories') ----- - vmBitnessString - "Return a string of 32 or 64 depending on the is64BitVM valuse" - ^is64BitVM ifTrue:['64'] ifFalse:['32']! Item was removed: - ----- Method: VMMakerTool>>set64BitVM: (in category 'generate sources') ----- - set64BitVM: boolean - "do I build a 64bit VM or not?" - boolean ifTrue:[vmMaker for64BitVM] ifFalse:[vmMaker for32BitVM]. - self changed: #sourcePathText! Item was removed: - ----- Method: VMMaker>>isFor64BitVM (in category 'initialize') ----- - isFor64BitVM - "is my flag to make a 64bit pointer model VM?" - ^is64BitVM! Item was removed: - ----- Method: CCodeGenerator>>emitDefineBytesPerWord:on: (in category 'C code generator') ----- - emitDefineBytesPerWord: bytesPerWord on: aStream - "Define word size dependent constants. These are mirrored by class - variables in ObjectMemory. The macro definitions here are used at compile - time to permit building a VM for either 32-bit or 64-bit object memory from - a single generated code base. - - If SQ_VI_BYTES_PER_WORD is defined as 8 (e.g. in config.h), then a VM for - 64-bit image will be built. Otherwise, a VM for 32-bit image is built." - - aStream cr; - nextPutAll: '/*'; cr; - nextPutAll: ' * define SQ_VI_BYTES_PER_WORD 8 for a 64-bit word size VM'; cr; - nextPutAll: ' * and default to SQ_VI_BYTES_PER_WORD 4 for a 32-bit word size VM'; cr; - nextPutAll: ' */'; cr; - nextPutAll: '#ifndef SQ_VI_BYTES_PER_WORD'; cr; - nextPutAll: '# define SQ_VI_BYTES_PER_WORD '; - print: bytesPerWord; cr; - nextPutAll: '#endif'; cr; cr; - nextPutAll: '#define BYTES_PER_WORD SQ_VI_BYTES_PER_WORD'; cr; - nextPutAll: '#define BASE_HEADER_SIZE SQ_VI_BYTES_PER_WORD'; cr; - - "Define various constants that depend on BytesPerWord" - nextPutAll: '#if (BYTES_PER_WORD == 4) // 32-bit object memory'; cr; - nextPutAll: '# define WORD_MASK 0xffffffff'; cr; "(1 bitShift: BytesPerWord*8) - 1" - nextPutAll: '# define SHIFT_FOR_WORD 2'; cr; "(BytesPerWord log: 2) rounded" - nextPutAll: '# define SMALL_CONTEXT_SIZE 92'; cr; "ContextFixedSizePlusHeader + 16 * BytesPerWord" - "Large contexts have 56 indexable fileds. Max with single header word." - "However note that in 64 bits, for now, large contexts have 3-word headers" - nextPutAll: '# define LARGE_CONTEXT_SIZE 252'; cr; "ContextFixedSizePlusHeader + 56 * BytesPerWord." - nextPutAll: '# define SIZE_MASK 0xfc'; cr; "Base header word bit field" - nextPutAll: '# define LONG_SIZE_MASK 0xfffffffc'; cr; "Base header word bit field" - nextPutAll: '# define SIZE_4_BIT 0'; cr; - nextPutAll: '# define MARK_BIT 0x80000000'; cr; "Top bit, 1 bitShift: BytesPerWord*8 - 1" - nextPutAll: '# define ROOT_BIT 0x40000000'; cr; "Next-to-top bit, 1 bitShift: BytesPerWord*8 - 2" - nextPutAll: '# define ALL_BUT_MARK_BIT 0x7fffffff'; cr; "WordMask - MarkBit." - nextPutAll: '# define ALL_BUT_ROOT_BIT 0xbfffffff'; cr; "WordMask - RootBit" - nextPutAll: '# define ALL_BUT_TYPE_MASK 0xfffffffc'; cr; "WordMask - TypeMask" - nextPutAll: '# define ALL_BUT_MARK_BIT_AND_TYPE_MASK 0x7ffffffc'; cr; "AllButTypeMask - MarkBit" - nextPutAll: '# define ALL_BUT_HASH_BITS 0xe001ffff'; cr; - - nextPutAll: '#else // 64-bit object memory'; cr; - nextPutAll: '# define WORD_MASK 0xffffffffffffffff'; cr; - nextPutAll: '# define SHIFT_FOR_WORD 3'; cr; - nextPutAll: '# define SMALL_CONTEXT_SIZE 184'; cr; - nextPutAll: '# define LARGE_CONTEXT_SIZE 504'; cr; - nextPutAll: '# define SIZE_MASK 0xf8'; cr; "Lose the 4 bit in temp 64-bit chunk format" - nextPutAll: '# define LONG_SIZE_MASK 0xfffffffffffffff8'; cr; - "The 4 bit is excluded from SIZE_MASK for 64-bit object memory, but need it" - "for ST size, so define SIZE_4_BIT." - nextPutAll: '# define SIZE_4_BIT 4'; cr; - nextPutAll: '# define MARK_BIT 0x8000000000000000'; cr; - nextPutAll: '# define ROOT_BIT 0x4000000000000000'; cr; - nextPutAll: '# define ALL_BUT_MARK_BIT 0x7fffffffffffffff'; cr; - nextPutAll: '# define ALL_BUT_ROOT_BIT 0xbfffffffffffffff'; cr; - nextPutAll: '# define ALL_BUT_TYPE_MASK 0xfffffffffffffffc'; cr; - nextPutAll: '# define ALL_BUT_MARK_BIT_AND_TYPE_MASK 0x7ffffffffffffffc'; cr; - nextPutAll: '# define ALL_BUT_HASH_BITS 0xffffffffe001ffff'; cr; - nextPutAll: '#endif // (BYTES_PER_WORD == 4)'; cr - - ! Item was removed: - ----- Method: VMMaker>>bytesPerWord (in category 'initialize') ----- - bytesPerWord - "Return the bytes in a word for the chosen 32bit/64bit pointer setup chosen" - ^is64BitVM ifTrue:[8] ifFalse:[4]! Item was removed: - ----- Method: VMMaker>>for64BitVM (in category 'initialize') ----- - for64BitVM - "set my flag to make a 64bit pointer model VM" - is64BitVM := true. - self changed: #sourceDirectory.! Item was removed: - ----- Method: VMMaker>>isFor32BitVM (in category 'initialize') ----- - isFor32BitVM - "is my flag to make a 32bit pointer model VM?" - ^is64BitVM not!

3 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2010