Vm-dev September 2009

vm-dev@lists.squeakfoundation.org

24 participants
46 discussions

Fwd: IA32ABI plugin and absolute library paths
by John M McIntosh 23 Sep '09

23 Sep '09

Ok, I had thought I had sent this to the list but apparently only to Eliot. The issue is that we don' t have a concept of looking for an absolute path when doing the module lookup, rather we look in a discrete number of known places, or in various system related directories. Should we have a modification that allows you to specify an absolute path? Begin forwarded message: > From: Ken Treis <ken(a)miriamtech.com> > Date: September 9, 2009 8:45:55 AM PDT > To: John McIntosh <johnmci(a)smalltalkconsulting.com> > Subject: IA32ABI plugin and absolute library paths > > Hi John, > > I'm not sure who to send this to, so let me know if there's a > mailing list that'd be better. > > I'm using Alien on my Mac (Snow Leopard). When I tried passing an > absolute library path to #lookup:inLibrary:, I saw the following in > debug logs: > >> 9/8/09 7:41:00 AM [0x0-0x9ce9ce].org.squeak.Squeak[59719] >> tryLoading /Applications/Squeak/Squeak 4.2.1beta1U.app/Contents/ >> Resources//opt/local/lib/libcairo.dylib.bundle/Contents/MacOS//opt/ >> local/lib/libcairo.dylib >> >> 9/8/09 7:41:00 AM [0x0-0x9ce9ce].org.squeak.Squeak[59719] >> tryLoading /Applications/Squeak/Squeak 4.2.1beta1U.app/Contents/ >> Resources//opt/local/lib/libcairo.dylib >> >> 9/8/09 7:41:00 AM [0x0-0x9ce9ce].org.squeak.Squeak[59719] >> tryLoading /Applications/Squeak/Plugins//opt/local/lib/ >> libcairo.dylib.bundle/Contents/MacOS//opt/local/lib/libcairo.dylib >> >> 9/8/09 7:41:00 AM [0x0-0x9ce9ce].org.squeak.Squeak[59719] >> tryLoading /Applications/Squeak/Plugins//opt/local/lib/libcairo.dylib > > I understand the utility of being able to pass multi-part path names > in here, but it seems like a leading slash on the filename should be > interpreted by the primitive as an absolute path. > > -- > Ken Treis > Miriam Technologies, Inc. > -- = = = ======================================================================== John M. McIntosh <johnmci(a)smalltalkconsulting.com> Twitter: squeaker68882 Corporate Smalltalk Consulting Ltd. http://www.smalltalkconsulting.com = = = ========================================================================

2 1

Why isn't signalSemaphoreWithIndex() thread-safe?
by Joshua Gargus 22 Sep '09

22 Sep '09

Hi, I've always assumed that signalSemaphoreWithIndex() must be thread-safe; after all, it's the "official" mechanism for notifying the image that an asynchronous event has occurred. However, a pang of paranoia prompted me to actually look at the code, and it seems clearly unsafe. This is bad, because I've been using it to signal events from separate native threads. What should we do about this? It seems to me that it should be wrapped in a critical section, using the appropriate platform-specific synchronization primitives. Thanks, Josh

5 20

Scripts not working without OSS
by Michael van der Gulik 21 Sep '09

21 Sep '09

Hi. The scripts don't work if you don't have any sound support: + exec padsp /home/mikevdg/lib/squeak/3.11.3-2135/squeakvm -pathenc UTF-8 -encoding UTF-8 -plugins /home/mikevdg/lib/squeak/3.11.3-2135 -vm-sound-oss could not find module vm-sound-OSS Aborted mikevdg@hutw4425:~/bin$ ~/lib/squeak/3.11.3-2135/squeakvm -version 3.11.3-2135 #1 XShm lun Sep 21 10:15:46 NZST 2009 gcc 4.3.3 Linux hutw4425 2.6.28-15-generic #49-Ubuntu SMP Tue Aug 18 19:25:34 UTC 2009 x86_64 GNU/Linux plugin path: /home/mikevdg/lib/squeak/3.11.3-2135/ [default: /home/mikevdg/lib/squeak/3.11.3-2135/] It works okay if I invoke it directly. Usually I don't use sound, so I don't bother compiling it in. Also, the version I got and compiled from http://www.squeak.org/ for a stock Ubuntu-amd64 install crashed whenever I copied text. This version works okay, so when it works its way to the main site, this issue will be resolved. Gulik. -- http://gulik.pbwiki.com/

2 1

[commit] r2142 - clear stored serial port name after successful close
by commits＠squeakvm.org 19 Sep '09

19 Sep '09

Author: piumarta Date: 2009-09-18 18:35:25 -0700 (Fri, 18 Sep 2009) New Revision: 2142 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/plugins/SerialPlugin/sqUnixSerial.c Log: clear stored serial port name after successful close Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-18 20:17:51 UTC (rev 2141) +++ trunk/platforms/unix/ChangeLog 2009-09-19 01:35:25 UTC (rev 2142) @@ -1,3 +1,8 @@ +2009-09-18 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> + + * plugins/SerialPlugin/sqUnixSerial.c (serialPortCloseByName): + Invalidate serial port name after closing. + 2009-09-18 <piumarta(a)ubuntu.piumarta.com> * cmake/squeak.in: Resolve symlinks in bindir. Fix missing Modified: trunk/platforms/unix/plugins/SerialPlugin/sqUnixSerial.c =================================================================== --- trunk/platforms/unix/plugins/SerialPlugin/sqUnixSerial.c 2009-09-18 20:17:51 UTC (rev 2141) +++ trunk/platforms/unix/plugins/SerialPlugin/sqUnixSerial.c 2009-09-19 01:35:25 UTC (rev 2142) @@ -1,6 +1,6 @@ /* sqUnixSerial.c -- Unix serial support * - * Last edited: 2009-08-22 14:13:41 by piumarta on ubuntu.piumarta.com + * Last edited: 2009-09-18 18:32:58 by piumarta on emilia-2.local */ #include "sq.h" @@ -197,6 +197,8 @@ return -1; } + sp->spName[0]= '\0'; + success(true); return 0; }

1 0

[commit] r2141 - resolve symlinks in bindir; fix missing error function
by commits＠squeakvm.org 18 Sep '09

18 Sep '09

Author: piumarta Date: 2009-09-18 13:17:51 -0700 (Fri, 18 Sep 2009) New Revision: 2141 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/squeak.in Log: resolve symlinks in bindir; fix missing error function Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-17 17:10:27 UTC (rev 2140) +++ trunk/platforms/unix/ChangeLog 2009-09-18 20:17:51 UTC (rev 2141) @@ -1,3 +1,8 @@ +2009-09-18 <piumarta(a)ubuntu.piumarta.com> + + * cmake/squeak.in: Resolve symlinks in bindir. Fix missing + 'error' function. + 2009-09-17 <piumarta(a)ubuntu.piumarta.com> * cmake/Plugins.cmake: Set ${plugin}_disabled for each plugin, Modified: trunk/platforms/unix/cmake/squeak.in =================================================================== --- trunk/platforms/unix/cmake/squeak.in 2009-09-17 17:10:27 UTC (rev 2140) +++ trunk/platforms/unix/cmake/squeak.in 2009-09-18 20:17:51 UTC (rev 2141) @@ -3,13 +3,29 @@ # Launch squeakvm from the command line or a menu script, with a good # plugin path, text encodings and pulseaudio kludge # -# Last edited: 2009-09-17 10:05:45 by piumarta on ubuntu.piumarta.com +# Last edited: 2009-09-18 13:14:40 by piumarta on ubuntu.piumarta.com PATH=/usr/bin:/bin -bindir=`dirname $0` -bindir=`cd ${bindir}; pwd` -prefix=`dirname ${bindir}` +realpath () { + path="$1" + while test -L "${path}"; do + dir=`dirname "${path}"` + dir=`cd "${dir}" && pwd -P` + path=`basename "${path}"` + path=`ls -l "${dir}/${path}" | sed 's,.* -> ,,'` + path="${dir}/${path}" + done + if test -d "${path}"; then + (cd "${path}" && pwd -P) + else + (cd `dirname "${path}"` && echo "`pwd -P`/`basename "${path}"`") + fi +} + +bindir=`realpath "${0}"` +bindir=`dirname "${bindir}"` +prefix=`dirname "${bindir}"` libdir="${prefix}/lib/squeak" plgdir="${libdir}/[version]" useoss="[useoss]" @@ -32,11 +48,11 @@ elif test -x "${bindir}/${vm}"; then # bld/squeak -> bld/squeakvm vm="${bindir}/${vm}" plugins="${bindir}/%n" -elif test -x "`which ${vm}`"; then - vm="`which ${vm}`" +elif test -x `which ${vm}`; then + vm=`which ${vm}` plugins="" else - error "cannot find ${vm}" + echo "cannot find ${vm}" >&2 exit 1 fi

1 0

About mantis 3929 (FPU register stack overflow)
by Nicolas Cellier 17 Sep '09

17 Sep '09

http://bugs.squeak.org/view.php?id=3929 has been identified as a problem of FPU register stack overflow on linux VM. A single change of line 51 of x86-sysv-asm.S solved this problem: fstpl ffiFloatReturnValue Though I did not write extensive tests, I used modified VM a while without problems. What do you think of inclusion in svn trunk ? Nicolas

5 4

[commit] r2140 - use padsp iff oss built; communicate with VM via env vars
by commits＠squeakvm.org 17 Sep '09

17 Sep '09

Author: piumarta Date: 2009-09-17 10:10:27 -0700 (Thu, 17 Sep 2009) New Revision: 2140 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/Plugins.cmake trunk/platforms/unix/cmake/config.in trunk/platforms/unix/cmake/squeak.in trunk/platforms/unix/vm/build.cmake Log: use padsp iff oss built; communicate with VM via env vars Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-17 15:56:33 UTC (rev 2139) +++ trunk/platforms/unix/ChangeLog 2009-09-17 17:10:27 UTC (rev 2140) @@ -1,5 +1,15 @@ 2009-09-17 <piumarta(a)ubuntu.piumarta.com> + * cmake/Plugins.cmake: Set ${plugin}_disabled for each plugin, + recording whether the plugin is to be built. + + * vm/build.cmake: Set useoss according to vm-sound-OSS_disabled. + + * cmake/config.in: Substitute [useoss] when configuring. + + * cmake/squeak.in: Communicate with the VM via environment. Don't + attempt to user padsp wrapper unless vm-sound-OSS was built. + * vm/config.cmake: Configure interp as "gnu-interp" if compiler is GCC, otherwise "interp". Modified: trunk/platforms/unix/cmake/Plugins.cmake =================================================================== --- trunk/platforms/unix/cmake/Plugins.cmake 2009-09-17 15:56:33 UTC (rev 2139) +++ trunk/platforms/unix/cmake/Plugins.cmake 2009-09-17 17:10:27 UTC (rev 2140) @@ -1,6 +1,6 @@ # Figure out which plugins to build and create a configuration for each. # -# Last edited: 2009-08-26 21:00:32 by piumarta on emilia-2.local +# Last edited: 2009-09-17 09:34:24 by piumarta on ubuntu.piumarta.com FILE (STRINGS ${src}/plugins.int plugins_int) STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_int ${plugins_int}) @@ -107,10 +107,12 @@ LIST (APPEND plugins_dis ${plugin}) ENDIF (${plugins_list} STREQUAL "plugins_int") MESSAGE ("!! ${plugin} disabled") + SET (${plugin}_disabled 1) ELSE (DEFINED plugin_disabled) IF (${plugins_list} STREQUAL "plugins_int") USE_LIBRARY (${plugin}) ENDIF (${plugins_list} STREQUAL "plugins_int") + SET (${plugin}_disabled) ENDIF (DEFINED plugin_disabled) ENDFOREACH (plugin) ENDMACRO (CONFIGURE_PLUGIN_LIST) Modified: trunk/platforms/unix/cmake/config.in =================================================================== --- trunk/platforms/unix/cmake/config.in 2009-09-17 15:56:33 UTC (rev 2139) +++ trunk/platforms/unix/cmake/config.in 2009-09-17 17:10:27 UTC (rev 2140) @@ -12,4 +12,5 @@ s%\[plgdir\]%@prefix@/@plgdir@%g s%\[mandir\]%@prefix@/@mandir@%g s%\[docdir\]%@prefix@/@docdir@%g +s%\[useoss\]%@useoss@%g " < $1 > $2 Modified: trunk/platforms/unix/cmake/squeak.in =================================================================== --- trunk/platforms/unix/cmake/squeak.in 2009-09-17 15:56:33 UTC (rev 2139) +++ trunk/platforms/unix/cmake/squeak.in 2009-09-17 17:10:27 UTC (rev 2140) @@ -3,23 +3,27 @@ # Launch squeakvm from the command line or a menu script, with a good # plugin path, text encodings and pulseaudio kludge # -# Last edited: 2009-08-27 22:25:34 by piumarta on emilia-2.local +# Last edited: 2009-09-17 10:05:45 by piumarta on ubuntu.piumarta.com PATH=/usr/bin:/bin -me=`basename $0` bindir=`dirname $0` bindir=`cd ${bindir}; pwd` prefix=`dirname ${bindir}` libdir="${prefix}/lib/squeak" plgdir="${libdir}/[version]" -wrapper="" +useoss="[useoss]" vm="squeakvm" plugins="" -sound="" -pathenc="-pathenc UTF-8" -encoding="-encoding UTF-8" +wrapper="" +for opt in $*; do + case ${opt} in + -vm-sound*) useoss="false";; + -vm) case "$2" in sound*) useoss="false"; esac;; + esac +done + # find the vm and set the plugin path if test -x "${plgdir}/${vm}"; then # bin/squeak -> lib/squeak/x.y-z/squeakvm @@ -36,45 +40,34 @@ exit 1 fi -# deal with pulseaudio if it is running +# command-line overrides environment, so communicate anything we decide here via the environment -if pulseaudio --check 2>/dev/null; then - sound="-vm-sound-oss" - if padsp true 2>/dev/null; then - wrapper=padsp +if test -z "${SQUEAK_PATHENC}"; then SQUEAK_PATHENC="UTF-8"; export SQUEAK_PATHENC; fi +if test -z "${SQUEAK_ENCODING}"; then SQUEAK_ENCODING="UTF-8"; export SQUEAK_ENCODING; fi + +if test -z "${SQUEAK_PLUGINS}"; then + if test -n "${plugins}"; then + SQUEAK_PLUGINS="${plugins}" + export SQUEAK_PLUGINS fi fi -# we should not interfere with the user's command-line options +# deal with pulseaudio if it is running -for opt in $*; do - case ${opt} in - -plugins) plugins="";; - -pathenc) pathenc="";; - -encoding) encoding="";; - -vm-sound*) sound=""; wrapper="";; - -vm) case "$2" in sound*) sound=""; wrapper=""; esac;; - esac -done - -# we should not interfere with the user's environment variables - -if test -n "${SQUEAK_PLUGINS}"; then - plugins="" +if test -z "${SQUEAK_VM}"; then + if ${useoss}; then + if pulseaudio --check 2>/dev/null; then + if padsp true 2>/dev/null; then + wrapper="padsp" + SQUEAK_VM="sound-OSS" + export SQUEAK_VM + fi + fi + fi fi -if test -n "${SQUEAK_PATHENC}"; then - pathenc="" -fi +# run the vm -if test -n "${SQUEAK_ENCODING}"; then - encoding="" -fi - -if test -z "${plugins}"; then - set -x - exec ${wrapper} "${vm}" ${pathenc} ${encoding} ${sound} "$@" -else - set -x - exec ${wrapper} "${vm}" ${pathenc} ${encoding} -plugins "${plugins}" ${sound} "$@" -fi +set | fgrep SQUEAK_ +set -x +exec ${wrapper} "${vm}" "$@" Modified: trunk/platforms/unix/vm/build.cmake =================================================================== --- trunk/platforms/unix/vm/build.cmake 2009-09-17 15:56:33 UTC (rev 2139) +++ trunk/platforms/unix/vm/build.cmake 2009-09-17 17:10:27 UTC (rev 2140) @@ -47,6 +47,12 @@ INSTALL (PROGRAMS ${bld}/squeakvm DESTINATION ${plgdir}) +IF (vm-sound-OSS_disabled) + SET (useoss "false") +ELSE () + SET (useoss "true") +ENDIF () + CONFIGURE_FILE (${config}/config.in ${bld}/config @ONLY) # launcher scripts

1 0

[commit] r2139 - try to gnuify interp.c if compiling with gcc
by commits＠squeakvm.org 17 Sep '09

17 Sep '09

Author: piumarta Date: 2009-09-17 08:56:33 -0700 (Thu, 17 Sep 2009) New Revision: 2139 Added: trunk/platforms/unix/cmake/gnuify trunk/platforms/unix/cmake/gnuify.awk Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/configure trunk/platforms/unix/vm/build.cmake trunk/platforms/unix/vm/config.cmake Log: try to gnuify interp.c if compiling with gcc Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-17 01:56:43 UTC (rev 2138) +++ trunk/platforms/unix/ChangeLog 2009-09-17 15:56:33 UTC (rev 2139) @@ -1,3 +1,19 @@ +2009-09-17 <piumarta(a)ubuntu.piumarta.com> + + * vm/config.cmake: Configure interp as "gnu-interp" if compiler is + GCC, otherwise "interp". + + * vm/build.cmake: squeakvm depends on bld/${interp}.c. Implicitly + build bld/gnu-interp.c from src/vm/interp.c using gnuify. + Implicitly build bld/interp.c by copying src/vm/interp.c. + + * cmake/gnuify: Try gnuify.awk with gawk then awk then cp. + + * cmake/gnuify.awk: Copied from old config/gnuify. + + * cmake/configure (svnversion): Quote unix/.svn to permit spaces + in pathnames. + 2009-09-16 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> * doc/RELEASE_NOTES_3.11.3.2135: Release 3.11.3.2135. Modified: trunk/platforms/unix/cmake/configure =================================================================== --- trunk/platforms/unix/cmake/configure 2009-09-17 01:56:43 UTC (rev 2138) +++ trunk/platforms/unix/cmake/configure 2009-09-17 15:56:33 UTC (rev 2139) @@ -1,6 +1,6 @@ #!/bin/sh -# Last edited: 2009-09-16 14:37:45 by piumarta on ubuntu.piumarta.com +# Last edited: 2009-09-16 14:48:48 by piumarta on ubuntu.piumarta.com RELEASE_TAG="" @@ -89,7 +89,7 @@ vmmversion="`tr '\015 ' '\012\012' < \"${interp_h}\" | sed '1,/VMMaker/d;q'`" -if test -d ${unix}/.svn; then +if test -d "${unix}/.svn"; then svnversion=`svn info "${unix}/ChangeLog" | fgrep Revision: | awk '{print $2}'` echo "${svnversion}" > "${unix}/svnversion" else Added: trunk/platforms/unix/cmake/gnuify =================================================================== --- trunk/platforms/unix/cmake/gnuify (rev 0) +++ trunk/platforms/unix/cmake/gnuify 2009-09-17 15:56:33 UTC (rev 2139) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# Last edited: 2009-09-17 08:47:30 by piumarta on ubuntu.piumarta.com + +gfy="$1" +src="$2" +dst="$3" +log="${dst}.log" + +rm -f "${dst}" "${log}" + +exec >> "${log}" 2>&1 + +set -x + +try () { "$1" -f "${gfy}" "${src}" > "${dst}" 2>> "${log}"; } + +try gawk || try awk || cp -p "${src}" "${dst}" Property changes on: trunk/platforms/unix/cmake/gnuify ___________________________________________________________________ Added: svn:executable + * Added: trunk/platforms/unix/cmake/gnuify.awk =================================================================== --- trunk/platforms/unix/cmake/gnuify.awk (rev 0) +++ trunk/platforms/unix/cmake/gnuify.awk 2009-09-17 15:56:33 UTC (rev 2139) @@ -0,0 +1,183 @@ +#!/usr/bin/awk -f +# +# Rewrite the interpreter source in $1 to use GNU C extensions, writing the +# modified file to stdout. +# +# Author: Ian.Piumarta(a)INRIA.Fr +# +# Last edited: 2009-09-17 08:34:23 by piumarta on ubuntu.piumarta.com + +# Copyright (C) 1996-2004 by Ian Piumarta and other authors/contributors +# listed elsewhere in this file. +# All rights reserved. +# +# This file is part of Unix Squeak. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +BEGIN { + print "/* This file has been post-processed for GNU C */\n\n"; +# print "copying first section of file" > "/dev/stderr"; + stage= 0; +} + +/#include "sq.h"/ { + print "#include \"sqGnu.h\"\n"; + next; +} + +# An inlining comment means the interpreter was not inlined + +/inline\: true/ { +# print NR, $0 > "/dev/stderr"; +# print "" > "/dev/stderr"; +# print "*** interpreter was not inlined: bailing out! ***" > "/dev/stderr"; +# print "" > "/dev/stderr"; + stage= -1; +} + + +(stage == 0) && /^int interpret$void$ \{/ { +# print "interpret: adding static register assignments" > "/dev/stderr"; + stage= 1; + print; + next; +} + +(stage == 0) && /^sqInt interpret$void$ \{/ { +# print "interpret: adding static register assignments" > "/dev/stderr"; + stage= 1; + print; + next; +} + +(stage == 1) && /^ char\* localIP;/ { + print " register char* localIP IP_REG;"; + next; +} + +(stage == 1) && /^register struct foo \* foo = &fum;/ { + print " register struct foo * foo GP_REG= &fum;"; + next; +} + +(stage == 1) && /^ char\* localSP;/ { + print " register char* localSP SP_REG;"; + next; +} + +(stage == 1) && /^ int currentBytecode;/ { + print " register int currentBytecode CB_REG;"; + next; +} + +(stage == 1) && /^ sqInt currentBytecode;/ { + print " register int currentBytecode CB_REG;"; + next; +} + +(stage == 1) && /^$/ { +# print "interpret: adding bytecode dispatch table" > "/dev/stderr"; + print " JUMP_TABLE;\n"; +# print "interpret: rewriting case labels and outer breaks" > "/dev/stderr"; + stage= 2; + FS=" "; +# FS="[ :]+"; + next; +} + +(stage == 2) && /^ case / { + print " CASE(" (($NF) + 0) ")"; +# print " CASE(" $3 ")"; + next; +} + +(stage == 2) && /^ break;/ { + print " BREAK;"; + next; +} + +(stage == 2) && /^\}/ { + stage= -1; + print; + next; +} + +(stage == 3) && /^int primitiveResponse$/ { + print; +# print "primitiveResponse: adding primitive dispatch table" > "/dev/stderr"; + print " PRIM_TABLE;\n"; +# print "primitiveResponse: rewriting case labels" > "/dev/stderr"; + stage= 4; + FS=" "; +# FS="[ :]+"; + next; +} + +(stage == 3) && /^sqInt primitiveResponse\(/ { + print; +# print "primitiveResponse: adding primitive dispatch table" > "/dev/stderr"; + print " PRIM_TABLE;\n"; +# print "primitiveResponse: rewriting case labels" > "/dev/stderr"; + stage= 4; + FS=" "; +# FS="[ :]+"; + next; +} + + +(stage == 4) && /^ switch \(primitiveIndex$ \{/ { +# print "primitiveResponse: adding primitive dispatch" > "/dev/stderr"; + print " PRIM_DISPATCH;"; + print; + next; +} + +(stage == 4) && /^ switch $foo->primitiveIndex$ \{/ { +# print "primitiveResponse: adding primitive dispatch" > "/dev/stderr"; + print " PRIM_DISPATCH;"; + print; + next; +} + +(stage == 4) && /^ case / { + print " CASE(" (($NF) + 0) ")"; +# print " CASE(" $3 ")"; + next; +} + +(stage == 4) && /^\}/ { +# print "copying last section of file" > "/dev/stderr"; + stage= -1; + FS=" "; + print; + next; +} + +# default +{ + print; + next; +} + +END { + if (stage != -1) { + print "#error GNUIFICATION FAILED (", stage, ")" + } +} Modified: trunk/platforms/unix/vm/build.cmake =================================================================== --- trunk/platforms/unix/vm/build.cmake 2009-09-17 01:56:43 UTC (rev 2138) +++ trunk/platforms/unix/vm/build.cmake 2009-09-17 15:56:33 UTC (rev 2139) @@ -1,7 +1,7 @@ LINK_DIRECTORIES (${vm_link_directories}) ADD_EXECUTABLE (squeakvm - ${src}/vm/interp.c + ${bld}/${interp}.c ${unix}/vm/aio.c ${unix}/vm/debug.c ${unix}/vm/osExports.c @@ -20,6 +20,16 @@ COMMAND ${config}/verstamp ${bld}/version.c ${CMAKE_C_COMPILER} ) +ADD_CUSTOM_COMMAND ( + OUTPUT ${bld}/interp.c + COMMAND ${CMAKE_COMMAND} -E copy ${src}/vm/interp.c ${bld}/interp.c} +) + +ADD_CUSTOM_COMMAND ( + OUTPUT ${bld}/gnu-interp.c + COMMAND ${config}/gnuify ${config}/gnuify.awk ${src}/vm/interp.c ${bld}/gnu-interp.c +) + INCLUDE_DIRECTORIES ( ${bld} ${src}/vm Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2009-09-17 01:56:43 UTC (rev 2138) +++ trunk/platforms/unix/vm/config.cmake 2009-09-17 15:56:33 UTC (rev 2139) @@ -16,7 +16,12 @@ CONFIG_DEFINE (DARWIN) -SET (interp interp) +IF (CMAKE_COMPILER_IS_GNUCC) + SET (interp gnu-interp) +ELSE () + SET (interp interp) + MESSAGE ("!! Cannot optimise interpreter performance for GCC") +ENDIF (CMAKE_COMPILER_IS_GNUCC) INCLUDE (TestBigEndian) INCLUDE (CheckIncludeFile)

1 0

Bug/W32: Version information mismatch
by Marco Schmidt 17 Sep '09

17 Sep '09

The version information from the resource file (svn: 3.11.3, src-release: 3.11.4) does not match with the information in the file sqWin32.h ("Squeak 3.11.5 (beta) from "...). The "About..."-box shows the correct information. Marco Schmidt -- View this message in context: http://www.nabble.com/Bug-W32%3A-Version-information-mismatch-tp25487177p25… Sent from the Squeak vm-dev mailing list archive at Nabble.com.

1 0

VMIL 2009 program available
by Michael Haupt 17 Sep '09

17 Sep '09

Hi, the program of this year's Workshop on Virtual Machines and Intermediate Languages (VMIL) - co-located with OOPSLA - is now available. I am really excited about it: we have highly promising invited talks and also a collection of very interesting paper presentations. Check it out: http://www.cs.iastate.edu/~design/vmil/2009/program.shtml ... and if you attend OOPSLA anyway, just drop me a note if you'd like to participate in the workshop. Best, Michael

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2009