Vm-dev October 2011

vm-dev@lists.squeakfoundation.org

25 participants
55 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

Squeak VM port to Google Native Client
by Yoshiki Ohshima 19 Feb '12

19 Feb '12

Hello, I'm playing with Google Native Client a bit and made a port of Squeak VM to it. It is far from complete (even the state where backspace or Cmd-p etc. does not work, sound does not work, etc.), It now reached to the state where I can say the basic part of it is working. The source code is available at: http://github.com/yoshikiohshima/NaClSqueak . Also, f you have Google Chrome 11 beta available, try to turn on the Native Client on (by typing "about:flags" into the title bar) and access: http://tinlizzie.org/~ohshima/squeak/squeak.html (The first try may take some time.) - It is gnuify-ed but we're still learning the JIT situation of NaCl. So, it' need some work to port Cog. - The image data is embedded as a C array in this executable. You can remove EMBEDDED_IMAGE_FILE flag off, and comment/uncomment the corresponding part of squeak.html, it can load the image separately via XMLHttpRequest of the browser. - There is some strange issue when you do fast drag the system window. - As you can see, the source code is derived from the Unix VM. It was hard for me to write some CMake stuff to set it up for the cross compilation. A help to merge it back to the Unix code would be greatly appreciated. - If Google takes over the world and all apps become a Native Client (may be even other browsers^^;), this port may be useful^^; -- Yoshiki

9 25

Cross compile Window from Unix/Mac os
by Jean Baptiste Arnaud 14 Dec '11

14 Dec '11

Since the last Igor ( thank ) update it 's possible to cross compile windows VM(last version) from MacOs and Unix. Using Mingw and cmake. Now, i do for Cog, and for ARM9 processor. My process imply to fix some window file cause some include are wrong, then it the cross compiler don't find some include beginning by Uppercase(cause the file isn't beginning by uppercase). In /Platform/win32/vm/sqWin32Intel.c #include <float.h> instead #include <Float.h> in /Platform/win32/plugin/SocketPlugin/sqWin32NewNet.c #include <ws2tcpip.h> instead #include <Ws2tcpip.h> Regard Jean Baptiste Arnaud jbaptiste.arnaud(a)gmail.com

4 8

[commit] r2505 - rename DPRINTF to DPRINTF3D for consistency
by commits＠squeakvm.org 31 Oct '11

31 Oct '11

Author: piumarta Date: 2011-10-30 18:32:54 -0700 (Sun, 30 Oct 2011) New Revision: 2505 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/plugins/B3DAcceleratorPlugin/sqUnixOpenGL.c Log: rename DPRINTF to DPRINTF3D for consistency Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2011-10-28 22:38:32 UTC (rev 2504) +++ trunk/platforms/unix/ChangeLog 2011-10-31 01:32:54 UTC (rev 2505) @@ -1,3 +1,8 @@ +2011-10-30 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> + + * plugins/B3DAcceleratorPlugin/sqUnixOpenGL.c: Rename DPRINTF -> + DPRINTF3D for consistency. + 2011-04-28 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> * plugins/LocalePlugin/sqUnixLocale.c: Do not copy trailing NUL Modified: trunk/platforms/unix/plugins/B3DAcceleratorPlugin/sqUnixOpenGL.c =================================================================== --- trunk/platforms/unix/plugins/B3DAcceleratorPlugin/sqUnixOpenGL.c 2011-10-28 22:38:32 UTC (rev 2504) +++ trunk/platforms/unix/plugins/B3DAcceleratorPlugin/sqUnixOpenGL.c 2011-10-31 01:32:54 UTC (rev 2505) @@ -86,7 +86,7 @@ return 0; if (!dpy->ioGLmakeCurrentRenderer(renderer)) { - DPRINTF(1, (fp, "glMakeCurrentRenderer failed\n")); + DPRINTF3D(1, (fp, "glMakeCurrentRenderer failed\n")); return 0; } } @@ -105,7 +105,7 @@ if (flags & ~(B3D_HARDWARE_RENDERER | B3D_SOFTWARE_RENDERER | B3D_STENCIL_BUFFER)) { - DPRINTF(1, (fp, "ERROR: Unsupported renderer flags (%d)\r", flags)); + DPRINTF3D(1, (fp, "ERROR: Unsupported renderer flags (%d)\r", flags)); return -1; } @@ -115,7 +115,7 @@ if (index == MAX_RENDERER) { - DPRINTF(1, (fp, "ERROR: Maximum number of renderers (%d) exceeded\r", MAX_RENDERER)); + DPRINTF3D(1, (fp, "ERROR: Maximum number of renderers (%d) exceeded\r", MAX_RENDERER)); return -1; } @@ -123,11 +123,11 @@ renderer->drawable= 0; renderer->context= 0; - DPRINTF(3, (fp, "---- Creating new renderer ----\r\r")); + DPRINTF3D(3, (fp, "---- Creating new renderer ----\r\r")); if ((w < 0) || (h < 0)) { - DPRINTF(1, (fp, "Negative extent (%i@%i)!\r", w, h)); + DPRINTF3D(1, (fp, "Negative extent (%i@%i)!\r", w, h)); goto fail; } else @@ -140,11 +140,11 @@ renderer->bufferRect[3] = h; if (!glMakeCurrentRenderer(renderer)) { - DPRINTF(1, (fp, "Failed to make context current\r")); + DPRINTF3D(1, (fp, "Failed to make context current\r")); glDestroyRenderer(index); return -1; } - DPRINTF(3, (fp, "\r### Renderer created! ###\r")); + DPRINTF3D(3, (fp, "\r### Renderer created! ###\r")); glDisable(GL_LIGHTING); glDisable(GL_COLOR_MATERIAL); glDisable(GL_BLEND); @@ -163,14 +163,14 @@ } fail: - DPRINTF(1, (fp, "OpenGL initialization failed\r")); + DPRINTF3D(1, (fp, "OpenGL initialization failed\r")); return -1; } glRenderer *glRendererFromHandle(int handle) { - DPRINTF(7, (fp, "Looking for renderer id: %i\r", handle)); + DPRINTF3D(7, (fp, "Looking for renderer id: %i\r", handle)); if ((handle >= 0) && (handle < MAX_RENDERER) && renderers[handle].used) return renderers + handle; return 0; @@ -180,7 +180,7 @@ int glDestroyRenderer(int handle) { glRenderer *renderer= glRendererFromHandle(handle); - DPRINTF(3, (fp, "\r--- Destroying renderer ---\r")); + DPRINTF3D(3, (fp, "\r--- Destroying renderer ---\r")); if (renderer) { if (!glMakeCurrentRenderer(0))

1 0

[commit] r2504 - Move editing of version number into Info.plist into various makevm scripts.
by commits＠squeakvm.org 28 Oct '11

28 Oct '11

Author: eliot Date: 2011-10-28 15:38:32 -0700 (Fri, 28 Oct 2011) New Revision: 2504 Added: branches/Cog/scripts/versionInfoPlist Modified: branches/Cog/macbuild/makevm branches/Cog/nsbuild/macbuild/CoreVM.plist branches/Cog/nsbuild/macbuild/makevm branches/Cog/nscogbuild/macbuild/CoreVM.plist branches/Cog/nscogbuild/macbuild/makevm branches/Cog/scripts/mkvmarchives Log: Move editing of version number into Info.plist into various makevm scripts. xcode strips out comments when building the foo.app/Contents/Info.plist and so there are no  markers left to notice later on in the build chain. Modified: branches/Cog/macbuild/makevm =================================================================== --- branches/Cog/macbuild/makevm 2011-10-25 18:52:29 UTC (rev 2503) +++ branches/Cog/macbuild/makevm 2011-10-28 22:38:32 UTC (rev 2504) @@ -65,6 +65,7 @@ else mv build/$BUILD_CONFIGURATION/Croquet.app "$DEST" fi +../scripts/versionInfoPlist ../platforms CoreVM.plist "$DEST/Contents/Info.plist" # Build the Float plugin echo Modified: branches/Cog/nsbuild/macbuild/CoreVM.plist =================================================================== --- branches/Cog/nsbuild/macbuild/CoreVM.plist 2011-10-25 18:52:29 UTC (rev 2503) +++ branches/Cog/nsbuild/macbuild/CoreVM.plist 2011-10-28 22:38:32 UTC (rev 2504) @@ -76,11 +76,11 @@ <key>CFBundleExecutable</key> <string>Newspeak Virtual Machine</string> <key>CFBundleGetInfoString</key> - <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string> + <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string> <key>CFBundleShortVersionString</key> - <string>Newspeak Virtual Machine 4.0.0</string> + <string>Newspeak Virtual Machine 4.0.0</string> <key>CFBundleVersion</key> - <string>4.0.0</string> + <string>4.0.0</string> <key>CFBundleIconFile</key> <string>Newspeak Virtual Machine.icns</string> <key>CFBundleIdentifier</key> Modified: branches/Cog/nsbuild/macbuild/makevm =================================================================== --- branches/Cog/nsbuild/macbuild/makevm 2011-10-25 18:52:29 UTC (rev 2503) +++ branches/Cog/nsbuild/macbuild/makevm 2011-10-28 22:38:32 UTC (rev 2504) @@ -58,6 +58,8 @@ mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app "$DEST" fi +../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist" + if false; then # Build the BochsIA32Plugin # N.B. To build the plugin you also have to build the Bochs libraries in Modified: branches/Cog/nscogbuild/macbuild/CoreVM.plist =================================================================== --- branches/Cog/nscogbuild/macbuild/CoreVM.plist 2011-10-25 18:52:29 UTC (rev 2503) +++ branches/Cog/nscogbuild/macbuild/CoreVM.plist 2011-10-28 22:38:32 UTC (rev 2504) @@ -122,11 +122,11 @@ <key>CFBundleExecutable</key> <string>Newspeak Virtual Machine</string> <key>CFBundleGetInfoString</key> - <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string> + <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string> <key>CFBundleShortVersionString</key> - <string>Newspeak Virtual Machine 4.0.0</string> + <string>Newspeak Virtual Machine 4.0.0</string> <key>CFBundleVersion</key> - <string>4.0.0</string> + <string>4.0.0</string> <key>CFBundleIconFile</key> <string>Newspeak Virtual Machine.icns</string> <key>CFBundleIdentifier</key> Modified: branches/Cog/nscogbuild/macbuild/makevm =================================================================== --- branches/Cog/nscogbuild/macbuild/makevm 2011-10-25 18:52:29 UTC (rev 2503) +++ branches/Cog/nscogbuild/macbuild/makevm 2011-10-28 22:38:32 UTC (rev 2504) @@ -57,6 +57,7 @@ else mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app "$DEST" fi +../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist" if false; then # Build the BochsIA32Plugin Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2011-10-25 18:52:29 UTC (rev 2503) +++ branches/Cog/scripts/mkvmarchives 2011-10-28 22:38:32 UTC (rev 2504) @@ -45,8 +45,6 @@ done fi EXES= -REV=`grep 'SvnRawRevisionString.*Rev:' platforms/Cross/vm/sqSCCSVersion.h \ - | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` if [ -n "$CL" ]; then rm -rf coglinux.tgz COPYFILE_DISABLE=1 tar czf coglinux.tgz coglinux @@ -61,7 +59,6 @@ test -d Cog.app || mkdir Cog.app rm -rf Cog.app/* Cog.app.tgz (cd macbuild/Fast.app>/dev/null;tar cf - *)|(cd Cog.app;tar xvf -) - ex "+g/<.--version-->/s/0$[< ]$/$REV\1/" +w +q Cog.app/Contents/Info.plist tar czf Cog.app.tgz Cog.app EXES="$EXES Cog.app/Contents/MacOS/Croquet" fi @@ -69,7 +66,6 @@ test -d CogMT.app || mkdir CogMT.app rm -rf CogMT.app/* CogMT.app.tgz (cd macbuild/FastMT.app>/dev/null;tar cf - *)|(cd CogMT.app;tar xvf -) - ex "+g/<.--version-->/s/0$[< ]$/$REV\1/" +w +q CogMT.app/Contents/Info.plist tar czf CogMT.app.tgz CogMT.app EXES="$EXES CogMT.app/Contents/MacOS/Croquet" fi @@ -111,7 +107,6 @@ test -d Newspeak\ Virtual\ Machine.app || mkdir Newspeak\ Virtual\ Machine.app rm -rf Newspeak\ Virtual\ Machine.app/* Newspeak\ Virtual\ Machine.app.tgz (cd $NSB/macbuild/Fast.app>/dev/null;tar cf - *)|(cd Newspeak\ Virtual\ Machine.app;tar xvf -) - ex "+g/<.--version-->/s/0$[< ]$/$REV\1/" +w +q Newspeak\ Virtual\ Machine.app/Contents/Info.plist tar czf Newspeak\ Virtual\ Machine.app.tgz Newspeak\ Virtual\ Machine.app EXES="$EXES Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" fi Added: branches/Cog/scripts/versionInfoPlist =================================================================== --- branches/Cog/scripts/versionInfoPlist (rev 0) +++ branches/Cog/scripts/versionInfoPlist 2011-10-28 22:38:32 UTC (rev 2504) @@ -0,0 +1,20 @@ +#!/bin/sh +# Script to edit an Info.plist based on a reference CoreVM.plist where lines +# marked with  contain unedited version numbers. Necessary +# because xcode strips out comments when building an Info.plist. +# e.g. ../scripts/versionInfoPlist ../platforms CoreVM.plist Fast.app/Contents/Info.plist +# +IFS=" +" +if [ $# != 3 ]; then + echo usage: $0 platformDir referencePlist toBeEditedPlist 1>&2 + exit 1 +fi +REV=`grep 'SvnRawRevisionString.*Rev:' "$1/Cross/vm/sqSCCSVersion.h" \ + | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` +for p in `grep -e --version-- "$2" \ + | sed 's/^[ ]*$.*$/\1/' \ + | sed 's./.\\\\/.g'` # double up for ex command below +do + ex "+g/$p/s/0$[< ]$/$REV\1/" +w +q "$3" +done Property changes on: branches/Cog/scripts/versionInfoPlist ___________________________________________________________________ Added: svn:executable + *

1 0

Direct object pointers vs indirect ones pros and cons
by Igor Stasenko 26 Oct '11

26 Oct '11

Hi , all RoarVM using object tables, while Squeak VM using direct pointers for object. This is a basic element of VM design, and i wonder, how much impact it does on overall VM speed. Both variants having own advantages/disadvantages, while i think, that with good JIT an extra indirection could be almost insignificant. But having indirect pointers to objects opens quite sexy perspectives. Being able to freely choose object(s) location means that: - its quite easy to implement object memory paging (swapping between memory and disc), - place particular object(s) into special memory location (good for FFI, object pinning etc) - #become: is O(1), instead of O(heap size) The downside of indirect pointers is, of course, a higher memory traffic, which directly impacts all operations everywhere. What else? I'd like to know, what you thinking about it, and why Squeak VM, in particular, using direct object pointers? What are this choice based on? I'd like to know. Maybe i missing something. -- Best regards, Igor Stasenko AKA sig.

10 23

Re: [Pharo-users] Oneiric gone bad
by Igor Stasenko 25 Oct '11

25 Oct '11

On 26 October 2011 00:16, Jeff Gray <jeff(a)rogerthedog.com> wrote: > Just updated Ubuntu and now Pharo doesn't run. > I have been working ok under Oneiric but then after getting the latest > update Pharo no longer runs. > If I drop into the terminal and try to fire up the VM I get the following: > > jeff@Roger:/usr/local/lib/cogvm$ ./squeakvm > could not find display driver vm-display-X11; either: > - check that /usr/local/lib/cogvm//vm-display-X11.so exists, or > - use the '-plugins <path>' option to tell me where it is, or > - remove DISPLAY from your environment. > Aborted > This error message is misleading and should be fixed. The driver vm-display-X11 is a dynamic library, which is shipped by default with VM, there is _no way_ how VM could not find it. The problem is that this library depending on another libraries in system which could be missing, and because of that, when VM attempts to load it, OS reports an error, and then VM says that its unable to find the driver, while actually it is unable to load it. > Any ideas? > > -- > View this message in context: http://forum.world.st/Oneiric-gone-bad-tp3938304p3938304.html > Sent from the Pharo Smalltalk Users mailing list archive at Nabble.com. > > -- Best regards, Igor Stasenko.

1 0

[commit] r2503 - Filter-out attempts to create MNU pics with new selectors. Fixes
by commits＠squeakvm.org 25 Oct '11

25 Oct '11

Author: eliot Date: 2011-10-25 11:52:29 -0700 (Tue, 25 Oct 2011) New Revision: 2503 Modified: branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Log: Filter-out attempts to create MNU pics with new selectors. Fixes Stephane Rollandin's crash of 21/10/2011: [((Compiler new evaluate: ('Beuh' ifNuk: [yo])) on: Error do: [:ex | ex description]) printString] fork Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2011-10-19 18:52:10 UTC (rev 2502) +++ branches/Cog/nscogsrc/vm/cogit.c 2011-10-25 18:52:29 UTC (rev 2503) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 + CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba from - StackToRegisterMappingCogit VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 + StackToRegisterMappingCogit VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -184,7 +184,7 @@ #define ECX 1 #define EDI 7 #define EDX 2 -#define EncounteredUnknownBytecode -3 +#define EncounteredUnknownBytecode -4 #define ESI 6 #define ESP 4 #define Fill16 5 @@ -261,10 +261,10 @@ #define LongSizeMask 0xFFFFFFFCUL #define MapEnd 0 #define MaxCompiledPrimitiveIndex 222 -#define MaxNegativeErrorCode -3 +#define MaxNegativeErrorCode -4 #define MaxNumArgs 15 #define MaxUnitDisplacement 31 -#define MaxUnreportableError -2 +#define MaxUnreportableError -3 #define MaxX2NDisplacement 992 #define MethodCacheClass 2 #define MethodCacheMask 0xFFC @@ -352,6 +352,7 @@ #define XMM7L 14 #define XorCwR 94 #define XorRR 80 +#define YoungSelectorInPIC -3 /*** Function Prototypes ***/ @@ -3130,6 +3131,9 @@ sqInt size; sqInt startAddress; + if (isYoung(selector)) { + return 0; + } compilationBreakpoint(selector, lengthOf(selector)); assert(endCPICCase0 != null); startAddress = allocate(closedPICSize); @@ -3205,6 +3209,9 @@ sqInt size; sqInt startAddress; + if (isYoung(selector)) { + return ((CogMethod *) YoungSelectorInPIC); + } compilationBreakpoint(selector, lengthOf(selector)); startAddress = allocate(closedPICSize); if (startAddress == 0) { Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2011-10-19 18:52:10 UTC (rev 2502) +++ branches/Cog/nscogsrc/vm/cogit.h 2011-10-25 18:52:29 UTC (rev 2503) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 + CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2011-10-19 18:52:10 UTC (rev 2502) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2011-10-25 18:52:29 UTC (rev 2503) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 + CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Oct 19 11:51:32 PDT 2011 + Tue Oct 25 11:25:05 PDT 2011 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2011-10-19 18:52:10 UTC (rev 2502) +++ branches/Cog/src/vm/cogit.c 2011-10-25 18:52:29 UTC (rev 2503) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 + CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba from - StackToRegisterMappingCogit VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 + StackToRegisterMappingCogit VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -184,7 +184,7 @@ #define ECX 1 #define EDI 7 #define EDX 2 -#define EncounteredUnknownBytecode -3 +#define EncounteredUnknownBytecode -4 #define ESI 6 #define ESP 4 #define Fill16 5 @@ -261,10 +261,10 @@ #define LongSizeMask 0xFFFFFFFCUL #define MapEnd 0 #define MaxCompiledPrimitiveIndex 222 -#define MaxNegativeErrorCode -3 +#define MaxNegativeErrorCode -4 #define MaxNumArgs 15 #define MaxUnitDisplacement 31 -#define MaxUnreportableError -2 +#define MaxUnreportableError -3 #define MaxX2NDisplacement 992 #define MethodCacheClass 2 #define MethodCacheMask 0xFFC @@ -352,6 +352,7 @@ #define XMM7L 14 #define XorCwR 94 #define XorRR 80 +#define YoungSelectorInPIC -3 /*** Function Prototypes ***/ @@ -3053,6 +3054,9 @@ sqInt size; sqInt startAddress; + if (isYoung(selector)) { + return 0; + } compilationBreakpoint(selector, lengthOf(selector)); assert(endCPICCase0 != null); startAddress = allocate(closedPICSize); @@ -3128,6 +3132,9 @@ sqInt size; sqInt startAddress; + if (isYoung(selector)) { + return ((CogMethod *) YoungSelectorInPIC); + } compilationBreakpoint(selector, lengthOf(selector)); startAddress = allocate(closedPICSize); if (startAddress == 0) { Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2011-10-19 18:52:10 UTC (rev 2502) +++ branches/Cog/src/vm/cogit.h 2011-10-25 18:52:29 UTC (rev 2503) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 + CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2011-10-19 18:52:10 UTC (rev 2502) +++ branches/Cog/src/vm/cogmethod.h 2011-10-25 18:52:29 UTC (rev 2503) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.134 uuid: a0d46c48-3d9a-43f9-a769-51f31ce120e9 + CCodeGenerator VMMaker.oscog-eem.135 uuid: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba */ typedef struct {

1 0

VM Maker: VMMaker.oscog-eem.135.mcz
by commits＠source.squeak.org 25 Oct '11

25 Oct '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.135.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.135 Author: eem Time: 25 October 2011, 11:21:12.168 am UUID: 1c85e5ef-0fe8-4a1e-9421-ff0d53845fba Ancestors: VMMaker.oscog-eem.134 Filter-out attempts to create MNU pics with new selectors. Fixes Stéphane Rollandin's crash of 21/10/2011: [((Compiler new evaluate: ('Beuh' ifNuk: [yo])) on: Error do: [:ex | ex description]) printString] fork =============== Diff against VMMaker.oscog-eem.134 =============== 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 traceLinkedSends traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMissCall missOffset entryPointMask checkedEntryAlignment 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 bytecodePointer opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxMethodBefore ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceStoreCheckTrampoline 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' + classVariableNames: 'AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxUnitDisplacement MaxUnreportableError MaxX2NDisplacement NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass YoungSelectorInPIC' - classVariableNames: 'AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxUnitDisplacement MaxUnreportableError MaxX2NDisplacement NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass' poolDictionaries: 'CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: '<historical>' 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. 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 changed: ----- Method: Cogit class>>initializeErrorCodes (in category 'class initialization') ----- initializeErrorCodes + self flag: 'these should be positive quantities and the check for error code should be a comparison against minCogMethodAddress/methodZoneBase'. NotFullyInitialized := -1. InsufficientCodeSpace := -2. + YoungSelectorInPIC := -3. + MaxUnreportableError := YoungSelectorInPIC. + EncounteredUnknownBytecode := -4. - MaxUnreportableError := InsufficientCodeSpace. - EncounteredUnknownBytecode := -3. MaxNegativeErrorCode := EncounteredUnknownBytecode! Item was changed: ----- Method: Cogit>>cogMNUPICSelector:methodOperand:numArgs: (in category 'in-line cacheing') ----- cogMNUPICSelector: selector methodOperand: methodOperand numArgs: numArgs <api> "Attempt to create a one-case PIC for an MNU. The tag for the case is at the send site and so doesn't need to be generated." <returnTypeC: #'CogMethod *'> | startAddress headerSize size end | + (objectMemory isYoung: selector) ifTrue: + [^0]. coInterpreter compilationBreak: selector point: (objectMemory lengthOf: selector). self assert: endCPICCase0 notNil. startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [coInterpreter callForCogCompiledCodeCompaction. ^0]. methodLabel address: startAddress; dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. self compileMNUCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') methodOperand: methodOperand numArgs: numArgs. self computeMaximumSizes. headerSize := self sizeof: CogMethod. size := self generateInstructionsAt: startAddress + headerSize. end := self outputInstructionsAt: startAddress + headerSize. "The missOffset is the same as the interpretOffset." self assert: missOffset = (interpretCall address + interpretCall machineCodeSize - startAddress). self assert: startAddress + cmEntryOffset = entry address. ^self fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') size: closedPICSize numArgs: numArgs numCases: 1 hasMNUCase: true selector: selector ! Item was changed: ----- Method: Cogit>>cogPICSelector:numArgs:Case0Method:Case1Method:tag:isMNUCase: (in category 'in-line cacheing') ----- cogPICSelector: selector numArgs: numArgs Case0Method: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase "Attempt to create a two-case PIC for case0CogMethod and case1Method,case1Tag. The tag for case0CogMethod is at the send site and so doesn't need to be generated. case1Method may be any of - a Cog method; link to its unchecked entry-point - a CompiledMethod; link to ceInterpretMethodFromPIC: - a CompiledMethod; link to ceMNUFromPICMNUMethod:receiver:" <var: #case0CogMethod type: #'CogMethod *'> <returnTypeC: #'CogMethod *'> | startAddress headerSize size end | + (objectMemory isYoung: selector) ifTrue: + [^self cCoerceSimple: YoungSelectorInPIC to: #'CogMethod *']. coInterpreter compilationBreak: selector point: (objectMemory lengthOf: selector). startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. methodLabel address: startAddress; dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. self compileCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') Case0: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs. self computeMaximumSizes. headerSize := self sizeof: CogMethod. size := self generateInstructionsAt: startAddress + headerSize. end := self outputInstructionsAt: startAddress + headerSize. "The missOffset is th same as the interpretOffset." self assert: missOffset = (interpretCall address + interpretCall machineCodeSize - startAddress). self assert: startAddress + cmEntryOffset = entry address. self assert: endCPICCase0 address = (startAddress + firstCPICCaseOffset). self assert: endCPICCase1 address = (startAddress + firstCPICCaseOffset + cPICCaseSize). ^self fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') size: closedPICSize numArgs: numArgs numCases: 2 hasMNUCase: isMNUCase selector: selector !

1 0

Oddness in Delay behavior in Cog...
by Lawson English 23 Oct '11

23 Oct '11

http://pastebin.com/zqhCpxvL In a nutshell: 0 to: 11 do: [:i| myWait := Delay forMilliseconds: i. Transcript show: (myWait asString),':';cr. 5 timesRepeat: [Transcript show: (Time millisecondsToRun: [1000 timesRepeat: [myWait wait]]);cr.]]. delay of 0 => 0 ms delay of 1 => 2 ms delay of 2 => 2 ms delay of 3 => 4 ms delay of 4 => 4 ms delay of 5 => 6 ms etc Not a real biggie, but just seemed odd. Lawson

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2011