Vm-dev May 2011

vm-dev@lists.squeakfoundation.org

36 participants
89 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

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

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

Re: [Pharo-project] out of memory - cog on windows
by Tudor Girba 27 Jun '11

27 Jun '11

Hi, On 18 May 2011, at 18:07, Levente Uzonyi wrote: > On Wed, 18 May 2011, Tudor Girba wrote: > > snip > >> >> I tried with several versions of Cog including the latest ones (on both platforms) and I got the same result. I did not try with an interpreter VM because I only have Cog images around (based on Pharo 1.2) and they are not compatible. > > You can use this interpreter vm to open cog images: http://leves.web.elte.hu/squeak/SqueakVM-Win32-4.4.9-2358-non-official-bin.… I tried with this VM, but it crashes with the attached error. In any case, if someone wants to reproduce it, here is an image to play with: http://dl.dropbox.com/u/18323746/Tmp/moose-case-study-windows-problem.zip Cheers, Doru > > Levente > > snip -- www.tudorgirba.com "Being happy is a matter of choice."

4 10

Squeak Port for Android: Update
by Dimitry Golubovsky 26 Jun '11

26 Jun '11

Hi, I am glad to announce that the Squeak Port for Android Tablets [1] has reached its first milestone. Work has been done towards fixing certain usability issues such as better integration with Android Input Methods, access to local file system, etc. The pre-packaged Android application (apk, signed with debug key), and zipped Image file (Image, changes, sources, demo project) are available from the project page at Google Code. Everyone is welcome to test the application on their Android devices. See the TestDrive [2] Wiki page for detailed instructions. Please report all issues to the project's issue tracker and Wiki pages. In my case it works on Pandigital Novel 9" eReader tablet with Android 2.0, not rooted. PS Two things are still known to be an issue: 1. Network sockets do not function properly; they were not addressed at this time 2. Android NDK rev. 3 is still required (because of the 4.2.1 toolchain); see [3] for some information PPS I also have been working on the presentation of this project (see notes and slides in the wiki). If there is any interested group of Smalltalk and/or Android users/developers in my area (South-eastern PA, US) I'd be glad to give an actual presentation. Thanks for any feedback. [1] http://code.google.com/p/squeakvm-tablet/ [2] http://code.google.com/p/squeakvm-tablet/wiki/TestDrive [3] http://squeakvm-tablet.googlecode.com/hg/project/ndk-build -- Dimitry Golubovsky Anywhere on the Web

4 3

I really don't understand why this doesn't crash
by Mariano Martinez Peck 18 Jun '11

18 Jun '11

Hi guys. I would really appreciate if someone could explain me the following. I have this class: Object subclass: #FooClass instanceVariableNames: 'var1 var2 var3 var4 var5' classVariableNames: '' poolDictionaries: '' category: 'Prueba' With this method: FooClass >> foo Transcript show: var5 asString. And then I have this class: Object subclass: #AnotherClass instanceVariableNames: 'age' classVariableNames: '' poolDictionaries: '' category: 'Prueba' Now, I run this test: | inst | inst := AnotherClass new. inst age: 42. (FooClass >> #foo) valueWithReceiver: inst arguments: #() So...I am evaluating the CompiledMethod installed on #foo on "inst". The compiledMethod has a bytecode (04) for accessing the var5. But "inst" only have one instVar. So....shouldn't that be a crash? because the VM is accessing outside the object... so, the test doesn't crash and in fact, it prints "1". I don't know what number means. I took a look to StackInterpreter >> pushReceiverVariable: fieldIndex self internalPush: (objectMemory fetchPointer: fieldIndex ofObject: self receiver). But I guess that should crash. Thanks for any tip, -- Mariano http://marianopeck.wordpress.com

4 6

Method executing but not sent to the receiver
by Mariano Martinez Peck 10 Jun '11

10 Jun '11

Hi folks. I need to be able to execute a method with an object but not sending a message to that object. So for example, I've checked Message>>sendTo: or CompiledMethod>>valueWithReceiver:arguments: and both of them are finally sent to the receiver. I need to do something like: (MyClass >>#foo) valueWith: anObject args: args. but I don't want that the primitive is sent to anObject. I would like to be able to send such message to the compiled method, and being the receiver. For example, something like this: CompiledMethod >> valueWithReceiver: aReceiver arguments: anArray "Execute compiledMethod against the receiver and args in argArray. The receiver is the CompiledMethod" <primitive: 666> self primitiveFailed Do you think this is doable ? If true, can you give me any hint ? I took a look to #primitiveExecuteMethod but I cannot figure out how to adapt it. Thanks in advance, Mariano

8 21

[commit] r2384 - Various reorganizations to support the Newspeak VM.
by commits＠squeakvm.org 01 Jun '11

01 Jun '11

Author: eliot Date: 2011-05-31 13:26:50 -0700 (Tue, 31 May 2011) New Revision: 2384 Modified: branches/Cog/platforms/Cross/plugins/IA32ABI/dabusiness.h branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abi.h branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c branches/Cog/platforms/Cross/vm/dispdbg.h branches/Cog/platforms/Cross/vm/sq.h branches/Cog/platforms/Cross/vm/sqMemoryAccess.h branches/Cog/platforms/Cross/vm/sqVirtualMachine.c branches/Cog/platforms/Cross/vm/sqVirtualMachine.h branches/Cog/platforms/Mac OS/vm/osExports.c branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/Mac OS/vm/sqMacTime.c branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c branches/Cog/platforms/Mac OS/vm/sqMacWindowUniversal.c branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h branches/Cog/platforms/unix/vm/sqPlatformSpecific.h branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqPlatformSpecific.h branches/Cog/platforms/win32/vm/sqWin32Exports.c branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/platforms/win32/vm/sqWin32Prefs.c branches/Cog/platforms/win32/vm/sqWin32Window.c Log: Various reorganizations to support the Newspeak VM. Newspeak-specific code included under -DNewspeakVM=1. Minor ones are making available certain command-line args for debugging to the NewspeakVM, niot just the StackVM. Add microsecond clock supprot for the still-millisecond based NewspeakVM. Update the Alien IA32ABI plugin with better Newspeak callback support (serializ- ing callback returns), and make its callouts work in the Cog VMs (where the stack grows downwards). Needs VMMaker.oscog-eem.68 or later. Modified: branches/Cog/platforms/Cross/plugins/IA32ABI/dabusiness.h =================================================================== --- branches/Cog/platforms/Cross/plugins/IA32ABI/dabusiness.h 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Cross/plugins/IA32ABI/dabusiness.h 2011-05-31 20:26:50 UTC (rev 2384) @@ -2,10 +2,12 @@ * dabusiness.h * * Written by Eliot Miranda 11/07. - * Copyright 2007 Cadence Design Systems. All rights reserved. + * Updated 5/2011 to cope with Cog stack direction. * * Body of the various callIA32XXXReturn functions. * Call a foreign function according to IA32-ish ABI rules. + * N.B. In Cog Stack and Cogit VMs numArgs is negative to access args from + * the downward-growing stack. */ long i, size; sqInt funcAlien, resultMaybeAlien; @@ -14,6 +16,17 @@ char *argstart; #endif +#if STACKVM /* Need to access args downwards from first arg */ + if (numArgs < 0) + for (i = size = 0; --i > numArgs;) { + sqInt arg = argVector[i]; + if (objIsAlien(arg) && sizeField(arg)) + size += moduloPOT(sizeof(long),abs(sizeField(arg))); + else /* assume an integer or pointer. check below. */ + size += sizeof(long); + } + else +#endif /* STACKVM */ for (i = numArgs, size = 0; --i >= 0;) { sqInt arg = argVector[i]; if (objIsAlien(arg) && sizeField(arg)) @@ -42,6 +55,44 @@ # endif #endif +#if STACKVM /* Need to access args downwards from first arg */ + if (numArgs < 0) + for (i = size = 0; --i > numArgs;) { + sqInt arg = argVector[i]; + if (isSmallInt(arg)) { + *(long *)argvec = intVal(arg); + argvec += sizeof(long); + } + else if (objIsAlien(arg)) { + long argByteSize; + + if (!(size = sizeField(arg))) + size = argByteSize = sizeof(void *); + else + argByteSize = abs(size); + memcpy(argvec, startOfDataWithSize(arg,size), argByteSize); + argvec += moduloPOT(sizeof(long), argByteSize); + } + else if (objIsUnsafeAlien(arg)) { + sqInt bitsObj = interpreterProxy->fetchPointerofObject(0,arg); + void *v = interpreterProxy->firstIndexableField(bitsObj); + *(void **)argvec = v; + argvec += sizeof(long); + } + else { + long v = interpreterProxy->signed32BitValueOf(arg); + if (interpreterProxy->failed()) { + interpreterProxy->primitiveFailFor(0); + v = interpreterProxy->positive32BitValueOf(arg); + if (interpreterProxy->failed()) + return PrimErrBadArgument; + } + *(long *)argvec = v; + argvec += sizeof(long); + } + } + else +#endif /* STACKVM */ for (i = 0; i < numArgs; i++) { sqInt arg = argVector[i]; if (isSmallInt(arg)) { @@ -66,8 +117,12 @@ } else { long v = interpreterProxy->signed32BitValueOf(arg); - if (interpreterProxy->failed()) - return PrimErrBadArgument; + if (interpreterProxy->failed()) { + interpreterProxy->primitiveFailFor(0); + v = interpreterProxy->positive32BitValueOf(arg); + if (interpreterProxy->failed()) + return PrimErrBadArgument; + } *(long *)argvec = v; argvec += sizeof(long); } @@ -87,7 +142,7 @@ size = sizeof(void *); memcpy(startOfDataWithSize(resultMaybeAlien,size), &r, - min(abs(size), sizeof(r))); + min((unsigned)abs(size), sizeof(r))); } return PrimNoErr; Modified: branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abi.h =================================================================== --- branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abi.h 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abi.h 2011-05-31 20:26:50 UTC (rev 2384) @@ -1,10 +1,10 @@ /* * platforms/Cross/plugins/IA32ABI/ia32abi.h * - * Written by Eliot Miranda 11/07. - * Copyright 2007 Cadence Design Systems. All rights reserved. + * Written by Eliot Miranda 11/2007. + * Updated 5/2011 to cope with Cog stack direction. * - * Call foreign functons returning results in either %eax, %edx (Integral) + * Call foreign functions returning results in either %eax, %edx (Integral) * or %f0 (Float, Double). * * The primitive will have signatures of the form @@ -20,10 +20,13 @@ * functionAddress <Alien> primFFICallResult: result <Alien> * with: firstArg <Alien> ... with: lastArg <Alien> * <primitive: 'primCallOutXXX' module: 'IA32ABI'> + * + * N.B. In Cog Stack and Cogit VMs numArgs is negative to access args from + * the downward-growing stack. */ #define SIGNATURE sqInt *argVector/* call args on stack or in array */, \ - int numArgs, /* arg count of function to call */ \ + int numArgs, /* arg count of function to call (*) */ \ int funcOffset, /* stack offset of func Alien */ \ int resultOffset/* stack offset of result Alien */ @@ -32,6 +35,7 @@ extern sqInt callIA32DoubleReturn (SIGNATURE); extern long thunkEntry (void *thunkp, long *stackp); extern void *allocateExecutablePage(long *pagesize); +extern VMCallbackContext *getMostRecentCallbackContext(void); /* Use the most minimal setjmp/longjmp pair available; no signal handling * wanted or necessary. Modified: branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c =================================================================== --- branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -3,8 +3,6 @@ * * Support for Call-outs and Call-backs from the Plugin. * Written by Eliot Miranda 11/07. - * Copyright 2007 Cadence Design Systems. All rights reserved. - * */ #if defined(_MSC_VER) || defined(__MINGW32__) @@ -27,6 +25,7 @@ # include <sys/mman.h> /* for mprotect */ #endif +#include <string.h> /* for memcpy et al */ #include <setjmp.h> #include <stdio.h> /* for fprintf(stderr,...) */ @@ -69,7 +68,7 @@ # define setsp(ignored) 0 #endif -#define moduloPOT(m,v) ((v)+(m)-1 & ~((m)-1)) +#define moduloPOT(m,v) (((v)+(m)-1) & ~((m)-1)) #define alignModuloPOT(m,v) ((void *)moduloPOT(m,(unsigned long)(v))) #define objIsAlien(anOop) (interpreterProxy->includesBehaviorThatOf(interpreterProxy->fetchClassOf(anOop), interpreterProxy->classAlien())) @@ -127,6 +126,27 @@ #include "dabusiness.h" } +/* Queueing order for callback returns. To ensure that callback returns occur + * in LIFO order we provide mostRecentCallbackContext which is tested by the return + * primitive primReturnFromContextThrough. In a threaded VM this will have to + * be thread-specific (as yet unimplemented). + */ +#if COGMTVM +# error as yet unimplemented +/* Test if need and allocate a thread-local variable index in + * allocateExecutablePage (low frequency operation). Keep a per-thread + * mostRecentCallbackContext. + */ +#else +static VMCallbackContext *mostRecentCallbackContext = 0; + +VMCallbackContext * +getMostRecentCallbackContext() { return mostRecentCallbackContext; } + +# define getRMCC(t) mostRecentCallbackContext +# define setRMCC(t) (mostRecentCallbackContext = (void *)(t)) +#endif + /* * Entry-point for call-back thunks. Args are thunk address and stack pointer, * where the stack pointer is pointing one word below the return address of the @@ -155,6 +175,7 @@ thunkEntry(void *thunkp, long *stackp) { VMCallbackContext vmcc; + VMCallbackContext *previousCallbackContext; int flags, returnType; if ((flags = interpreterProxy->ownVM(0)) < 0) { @@ -163,15 +184,19 @@ } if (!(returnType = setjmp(vmcc.trampoline))) { + previousCallbackContext = getRMCC(); + setRMCC(&vmcc); vmcc.thunkp = thunkp; vmcc.stackp = stackp + 2; /* skip address of retpc & retpc (thunk) */ vmcc.intregargsp = 0; vmcc.floatregargsp = 0; interpreterProxy->sendInvokeCallbackContext(&vmcc); fprintf(stderr,"Warning; callback failed to invoke\n"); + setRMCC(previousCallbackContext); interpreterProxy->disownVM(flags); return -1; } + setRMCC(previousCallbackContext); interpreterProxy->disownVM(flags); switch (returnType) { Modified: branches/Cog/platforms/Cross/vm/dispdbg.h =================================================================== --- branches/Cog/platforms/Cross/vm/dispdbg.h 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Cross/vm/dispdbg.h 2011-05-31 20:26:50 UTC (rev 2384) @@ -17,6 +17,15 @@ * various definitions of the sendBreakpointreceiver macro for break-pointing at * specific sends. */ +#if STACKVM +# define warnSendBreak() do { \ + suppressHeartbeatFlag = 1; \ + warning("send breakpoint (heartbeat suppressed)"); \ + } while (0) +#else +# define warnSendBreak() warning("send breakpoint") +#endif + #if PRODUCTION /* default for no send breakpoint. */ # define sendBreakpointreceiver(sel, len, rcvr) 0 @@ -36,22 +45,18 @@ # define sendBreakpointreceiver(sel, len, rcvr) do { \ if ((len) == breakSelectorLength \ && !strncmp((char *)(sel), breakSelector, breakSelectorLength)) { \ - suppressHeartbeatFlag = 1; \ - warning("send breakpoint (heartbeat suppressed)"); \ + warnSendBreak(); \ if (0) sendTrace = 1; \ } \ - if (sendTrace) { \ + if (sendTrace) \ printf("%.*s\n", len, (char *)(sel)); \ - if (0 && !checkHeapIntegrity()) error("object leak"); \ - } \ } while (0) #elif 0 /* breakpoint with byteCount. */ # define sendBreakpointreceiver(sel, len, rcvr) do { \ if ((len) == breakSelectorLength \ && !strncmp((char *)(sel), breakSelector, breakSelectorLength)) { \ - suppressHeartbeatFlag = 1; \ - warning("send breakpoint (heartbeat suppressed)"); \ + warnSendBreak(); \ if (0) sendTrace = 1; \ } \ if (sendTrace) \ @@ -63,15 +68,22 @@ * various definitions of the bytecodeDispatchDebugHook macro for * debugging code at the bytecode dispatch switch. */ +#if STACKVM +# define ValidInstructionPointerCheck() \ + validInstructionPointerinMethodframePointer((usqInt)localIP, GIV(method), localFP) +#else +# define ValidInstructionPointerCheck() \ + validInstructionPointerinMethod((usqInt)localIP, GIV(method)) +#endif + #if PRODUCTION # define bytecodeDispatchDebugHook() 0 -#elif 1 /* check for valid instruction pointer */ +#elif 0 /* check for valid instruction pointer */ # define bytecodeDispatchDebugHook() do { \ - if (!validInstructionPointerinMethodframePointer((usqInt)localIP, GIV(method), localFP)) \ + if (!ValidInstructionPointerCheck()) \ warning("invalidInstructionPointerinMethod"); \ } while (0) - #elif 0 /* check for valid stack-related pointers */ # define DEBUG_DISABLE_HEARTBEAT 1 # define bytecodeDispatchDebugHook() do { \ @@ -104,18 +116,24 @@ # define bytecodeDispatchDebugHook() do { \ if (++GIV(byteCount) == 175779UL) \ warning("break byteCount reached\n"); \ - if (!validInstructionPointerinMethodframePointer((usqInt)localIP, GIV(method), localFP)) \ + if (!ValidInstructionPointerCheck()) \ warning("invalidInstructionPointerinMethod"); \ } while (0) #elif 0 /* maintain byteCount & check for valid instruction pointer */ -# define bytecodeDispatchDebugHook() do { \ - printf("%ld: %x %d\n", ++GIV(byteCount), localIP-GIV(method)-3, currentBytecode); \ - if (!validInstructionPointerinMethodframePointer((usqInt)localIP, GIV(method), localFP)) \ +#define bytecodeDispatchDebugHook() do { \ + printf("%ld: %d %x(%d)\n", ++GIV(byteCount), localIP-GIV(method)-3, currentBytecode, currentBytecode); \ + if (!ValidInstructionPointerCheck()) \ warning("invalidInstructionPointerinMethod"); \ - if (sendTrace) printCallStack(); \ + if (sendTrace > 1) printContext(GIV(activeContext)); \ } while (0) - +#elif 0 /* maintain byteCount & check for valid instruction pointer */ +#define bytecodeDispatchDebugHook() do { \ + printf("%ld: %d %x(%d)\n", ++GIV(byteCount), localIP-GIV(method)-3, currentBytecode, currentBytecode); \ + if (!ValidInstructionPointerCheck()) \ + warning("invalidInstructionPointerinMethod"); \ + if (sendTrace > 1) printCallStack(); \ + } while (0) #elif 0 /* print current frame & instruction pointer on every bytecode. */ # define bytecodeDispatchDebugHook() do { \ printFrameWithSP(localFP,localSP); \ @@ -129,4 +147,8 @@ printf("%d %x\n", localIP - GIV(method) - 3, currentBytecode); \ } \ } while (0) +#elif 0 +# define bytecodeDispatchDebugHook() printContextWithSP(activeContext,localSP) +#else +# define bytecodeDispatchDebugHook() 0 #endif Modified: branches/Cog/platforms/Cross/vm/sq.h =================================================================== --- branches/Cog/platforms/Cross/vm/sq.h 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Cross/vm/sq.h 2011-05-31 20:26:50 UTC (rev 2384) @@ -212,16 +212,10 @@ sqInt ioHasDisplayDepth(sqInt depth); sqInt ioSetDisplayMode(sqInt width, sqInt height, sqInt depth, sqInt fullscreenFlag); -#if STACKVM +#if STACKVM || NewspeakVM /* thread subsystem support for e.g. sqExternalSemaphores.c */ void ioInitThreads(); -/* Event polling via periodic heartbeat thread. */ -void ioInitHeartbeat(void); -int ioHeartbeatMilliseconds(void); -void ioSetHeartbeatMilliseconds(int); -unsigned long ioHeartbeatFrequency(int); - /* Management of the external semaphore table (max size set at startup) */ #if !defined(INITIAL_EXT_SEM_TABLE_SIZE) # define INITIAL_EXT_SEM_TABLE_SIZE 256 @@ -240,7 +234,16 @@ extern sqOSThread ioVMThread; # define getVMOSThread() ioVMThread # endif +#endif /* STACKVM || NewspeakVM */ + +#if STACKVM +/* Event polling via periodic heartbeat thread. */ +void ioInitHeartbeat(void); +int ioHeartbeatMilliseconds(void); +void ioSetHeartbeatMilliseconds(int); +unsigned long ioHeartbeatFrequency(int); #endif /* STACKVM */ + #if COGMTVM #define THRLOGSZ 256 extern int thrlogidx; Modified: branches/Cog/platforms/Cross/vm/sqMemoryAccess.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2011-05-31 20:26:50 UTC (rev 2384) @@ -133,10 +133,27 @@ #define long32At intAt #define long32Atput intAtput -/* platform-dependent float conversion macros */ -/* Note: Second argument must be a variable name, not an expression! */ -#if defined(DOUBLE_WORD_ALIGNMENT) +/* platform-dependent float conversion macros. + * Note: Second argument must be a variable name, not an expression! + * Pre-Cog systems stored floats in Mac PowerPC big-endian format. + * BigEndianFloats selects this behaviour for backwards-compatibility. + * RISC systems typically insist on double-word alignment of double-words, but + * the heap is only word-aligned. DOUBLE_WORD_ALIGNMENT selects word access. + */ +#if BigEndianFloats && !VMBIGENDIAN /* this is to allow strict aliasing assumption in the optimizer */ +typedef union { double d; int i[sizeof(double) / sizeof(int)]; } _swapper; +/* word-based copy with swapping for non-PowerPC order */ +# define storeFloatAtPointerfrom(intPointerToFloat, doubleVar) do { \ + *((int *)(intPointerToFloat) + 0) = ((_swapper *)(&doubleVar))->i[1]; \ + *((int *)(intPointerToFloat) + 1) = ((_swapper *)(&doubleVar))->i[0]; \ + } while (0) +# define fetchFloatAtPointerinto(intPointerToFloat, doubleVar) do { \ + ((_swapper *)(&doubleVar))->i[1] = *((int *)(intPointerToFloat) + 0); \ + ((_swapper *)(&doubleVar))->i[0] = *((int *)(intPointerToFloat) + 1); \ + } while (0) +# elif defined(DOUBLE_WORD_ALIGNMENT) +/* this is to allow strict aliasing assumption in the optimizer */ typedef union { double d; int i[sizeof(double) / sizeof(int)]; } _aligner; /* word-based copy for machines with alignment restrictions */ # define storeFloatAtPointerfrom(intPointerToFloat, doubleVar) do { \ @@ -147,11 +164,11 @@ ((_aligner *)(&doubleVar))->i[0] = *((int *)(intPointerToFloat) + 0); \ ((_aligner *)(&doubleVar))->i[1] = *((int *)(intPointerToFloat) + 1); \ } while (0) -#else /* !DOUBLE_WORD_ALIGNMENT */ +#else /* !(BigEndianFloats && !VMBIGENDIAN) && !DOUBLE_WORD_ALIGNMENT */ /* for machines that allow doubles to be on any word boundary */ # define storeFloatAtPointerfrom(i, doubleVar) (*((double *) (i)) = (doubleVar)) # define fetchFloatAtPointerinto(i, doubleVar) ((doubleVar) = *((double *) (i))) -#endif +#endif /* !(BigEndianFloats && !VMBIGENDIAN) && !DOUBLE_WORD_ALIGNMENT */ #define storeFloatAtfrom(i, doubleVar) storeFloatAtPointerfrom(pointerForOop(i), doubleVar) #define fetchFloatAtinto(i, doubleVar) fetchFloatAtPointerinto(pointerForOop(i), doubleVar) @@ -161,14 +178,11 @@ #define fetchSingleFloatAtinto(i, floatVar) fetchSingleFloatAtPointerinto(pointerForOop(i), floatVar) -/* This doesn't belong here, but neither do 'self flag: ...'s belong in the image. */ +/* This doesn't belong here, but neither do 'self flag: ...'s belong in the + image. We use a macro, not an inline function; we need no trace of flag. + */ +#define flag(foo) 0 -#ifdef _MSC_VER -static void flag(char *ignored) {} -#else -static inline void flag(char *ignored) {} -#endif - /* heap debugging facilities in sqHeapMap.c */ extern void clearHeapMap(void); extern int heapMapAtWord(void *wordPointer); Modified: branches/Cog/platforms/Cross/vm/sqVirtualMachine.c =================================================================== --- branches/Cog/platforms/Cross/vm/sqVirtualMachine.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Cross/vm/sqVirtualMachine.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -173,8 +173,10 @@ sqInt isInMemory(sqInt address); sqInt classAlien(void); /* Alien FFI */ sqInt classUnsafeAlien(void); /* Alien FFI */ +sqInt getStackPointer(void); /* Newsqueak FFI */ void *startOfAlienData(sqInt); usqInt sizeOfAlienData(sqInt); +sqInt signalNoResume(sqInt); sqInt getStackPointer(void); /* Alien FFI */ sqInt sendInvokeCallbackStackRegistersJmpbuf(sqInt thunkPtrAsInt, sqInt stackPtrAsInt, sqInt regsPtrAsInt, sqInt jmpBufPtrAsInt); /* Alien FFI */ sqInt reestablishContextPriorToCallback(sqInt callbackContext); /* Alien FFI */ @@ -186,8 +188,15 @@ /* Proxy declarations for v1.8 */ +#if NewspeakVM +static sqInt +callbackEnter(sqInt *callbackID) { return 0; } +static sqInt +callbackLeave(sqInt *callbackID) { return 0; } +#else sqInt callbackEnter(sqInt *callbackID); sqInt callbackLeave(sqInt callbackID); +#endif sqInt addGCRoot(sqInt *varLoc); sqInt removeGCRoot(sqInt *varLoc); @@ -420,7 +429,7 @@ VM->sendInvokeCallbackStackRegistersJmpbuf = sendInvokeCallbackStackRegistersJmpbuf; VM->reestablishContextPriorToCallback = reestablishContextPriorToCallback; # if ALIEN_FFI - VM->getStackPointer = 0; + VM->getStackPointer = (sqInt *(*)(void))getStackPointer; # endif # if IMMUTABILITY VM->internalIsImmutable = internalIsImmutable; @@ -465,6 +474,7 @@ VM->cStringOrNullFor = cStringOrNullFor; VM->startOfAlienData = startOfAlienData; VM->sizeOfAlienData = sizeOfAlienData; + VM->signalNoResume = signalNoResume; #endif return VM; Modified: branches/Cog/platforms/Cross/vm/sqVirtualMachine.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqVirtualMachine.h 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Cross/vm/sqVirtualMachine.h 2011-05-31 20:26:50 UTC (rev 2384) @@ -311,6 +311,7 @@ char *(*cStringOrNullFor)(sqInt); void *(*startOfAlienData)(sqInt); usqInt (*sizeOfAlienData)(sqInt); + sqInt (*signalNoResume)(sqInt); #endif } VirtualMachine; Modified: branches/Cog/platforms/Mac OS/vm/osExports.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/osExports.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Mac OS/vm/osExports.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -14,7 +14,9 @@ #include <stdio.h> #include "sqMacUIEvents.h" -#include "SerialPlugin.h" +#if !NewspeakVM +# include "SerialPlugin.h" +#endif /* duh ... this is ugly */ @@ -26,9 +28,11 @@ void setMessageHook(eventMessageHook theHook); void setPostMessageHook(eventMessageHook theHook); char * GetAttributeString(int id); +#if !NewspeakVM int serialPortSetControl(int portNum,int control, char *data); int serialPortIsOpen(int portNum); int serialPortNames(int portNum, char *portName, char *inName, char *outName); +#endif Boolean IsKeyDown(void); int primitivePluginBrowserReady(void); #ifdef ENABLE_URL_FETCH @@ -47,6 +51,7 @@ XFN(setPostMessageHook) XFN(GetAttributeString) XFN(recordDragDropEvent) +#if !NewspeakVM XFN(serialPortSetControl) XFN(serialPortIsOpen) XFN(serialPortClose) @@ -55,6 +60,7 @@ XFN(serialPortOpen) XFN(serialPortReadInto) XFN(serialPortWriteFrom) +#endif XFN(IsKeyDown) XFN(getUIToLock) /* Plugin support primitives Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -163,7 +163,15 @@ printf("C stack backtrace:\n"); fflush(stdout); /* backtrace_symbols_fd uses unbuffered i/o */ depth = backtrace(addrs, BACKTRACE_DEPTH); +# if 0 /* Mac OS's backtrace_symbols_fd prints NULL byte droppings each line */ backtrace_symbols_fd(addrs, depth, fileno(stdout)); +# else + { int i; char **strings; + strings = backtrace_symbols(addrs, depth); + for (i = 0; i < depth; i++) + printf("%s\n", strings[i]); + } +# endif #endif if (ioOSThreadsEqual(ioCurrentOSThread(),getVMOSThread())) { @@ -211,8 +219,10 @@ } else printf("\nCan't dump Smalltalk stack(s). Not in VM thread\n"); +#if STACKVM printf("\nMost recent primitives\n"); dumpPrimTraceLog(); +#endif fflush(stdout); } @@ -362,15 +372,6 @@ SetVMPathFromApplicationDirectory(); - { - // Change working directory, this works under os-x, previous logic worked pre os-x 10.4 - - char target[4097],temp[4097]; - getVMPathWithEncoding(target,gCurrentVMEncoding); - sqFilenameFromStringOpen(temp,(sqInt) target, strlen(target)); - chdir(temp); - } - /* install apple event handlers and wait for open event */ InstallAppleEventHandlers(); while (ShortImageNameIsEmpty()) { Modified: branches/Cog/platforms/Mac OS/vm/sqMacTime.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacTime.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Mac OS/vm/sqMacTime.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -55,14 +55,46 @@ ioInitTime(); } #else /* STACKVM */ +static TMTask gTMTask; +static unsigned int lowResMSecs= 0; -void SetUpTimers(void) +#define LOW_RES_TICK_MSECS 16 +#define HIGH_RES_TICK_MSECS 2 +#define COUNTER_LIMIT LOW_RES_TICK_MSECS/HIGH_RES_TICK_MSECS + +static pascal void +MyTimerProc(QElemPtr time) { + lowResMSecs = ioMicroMSecs(); + PrimeTime((QElemPtr)time, LOW_RES_TICK_MSECS); + return; +} + +void +SetUpTimers(void) +{ /* set up the micro/millisecond clock */ gettimeofday(&startUpTime, 0); + + gTMTask.tmAddr = NewTimerUPP((TimerProcPtr) MyTimerProc); + gTMTask.tmCount = 0; + gTMTask.tmWakeUp = 0; + gTMTask.tmReserved = 0; + + InsXTime((QElemPtr)(&gTMTask.qLink)); + PrimeTime((QElemPtr)&gTMTask.qLink,LOW_RES_TICK_MSECS); } -int ioMicroMSecs(void) +#if 1 +int +ioLowResMSecs(void) { return lowResMSecs; } +#else +int +ioLowResMSecs(void) { return ioMicroMSecs(); } +#endif + +int +ioMicroMSecs(void) { struct timeval now; gettimeofday(&now, 0); @@ -74,7 +106,8 @@ return (now.tv_usec / 1000 + now.tv_sec * 1000); } -int ioSeconds(void) { +int +ioSeconds(void) { time_t unixTime; unixTime = time(0); @@ -112,6 +145,34 @@ int ioMSecs() { return ioMicroMSecs(); } + +#define SecondsFrom1901To1970 2177452800ULL +#define MicrosecondsFrom1901To1970 2177452800000000ULL + +#define MicrosecondsPerSecond 1000000ULL +#define MillisecondsPerSecond 1000ULL + +#define MicrosecondsPerMillisecond 1000ULL +/* Compute the current VM time basis, the number of microseconds from 1901. */ + +static unsigned long long +currentUTCMicroseconds() +{ + struct timeval utcNow; + + gettimeofday(&utcNow,0); + return ((utcNow.tv_sec * MicrosecondsPerSecond) + utcNow.tv_usec) + + MicrosecondsFrom1901To1970; +} + +usqLong +ioUTCMicroseconds() { return currentUTCMicroseconds(); } + +/* This is an expensive interface for use by profiling code that wants the time + * now rather than as of the last heartbeat. + */ +usqLong +ioUTCMicrosecondsNow() { return currentUTCMicroseconds(); } #endif /* STACKVM */ time_t convertToSqueakTime(time_t unixTime) Modified: branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -1547,3 +1547,11 @@ recordWindowEventCarbon(WindowEventClose,0, 0, 0, 0, 1 /* main ST window index */ ); } + +#if NewspeakVM +/* For now this is only here to make the linker happy; + the function really does something interesting only on Windows. + */ +void +ioDrainEventQueue() {} +#endif /* NewspeakVM */ Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -152,16 +152,22 @@ if (!strcmp(argv[0], "-help")) { usage(); return 1; } - else if (!strncmp(argv[0], "-psn_", 5)) { - return 1; } - else if (!strcmp(argv[0], "-headless")) { - gSqueakHeadless = true; return 1; } - else if (!strcmp(argv[0], "-headfull")) { - gSqueakHeadless = false; return 1; } + else if (!strncmp(argv[0], "-psn_", 5)) { return 1; } + else if (!strcmp(argv[0], "-headless")) { gSqueakHeadless = true; return 1; } + else if (!strcmp(argv[0], "-headfull")) { gSqueakHeadless = false; return 1; } +#if STACKVM && !COGVM || NewspeakVM + else if (!strcmp(argv[0], "-sendtrace")) { extern sqInt sendTrace; sendTrace = 1; return 1; } +#endif else if (argc > 1) { if (!strcmp(argv[0], "-memory")) { gMaxHeapSize = strtobkm(argv[1]); return 2; } +#if STACKVM || NewspeakVM + else if (!strcmp(argv[0], "-breaksel")) { + extern void setBreakSelector(char *); + setBreakSelector(argv[1]); + return 2; } +#endif #if STACKVM else if (!strcmp(argv[0], "-eden")) { extern sqInt desiredEdenBytes; @@ -175,10 +181,6 @@ extern sqInt desiredNumStackPages; desiredNumStackPages = atoi(argv[1]); return 2; } - else if (!strcmp(argv[0], "-breaksel")) { - extern void setBreakSelector(char *); - setBreakSelector(argv[1]); - return 2; } else if (!strcmp(argv[0], "-noheartbeat")) { extern sqInt suppressHeartbeatFlag; suppressHeartbeatFlag = 1; @@ -258,10 +260,13 @@ printf("\nCommon <option>s:\n"); printf(" -help print this help message, then exit\n"); printf(" -memory <size>[mk] use fixed heap size (added to image size)\n"); +#if STACKVM || NewspeakVM + printf(" -breaksel selector set breakpoint on send of selector\n"); +#endif #if STACKVM printf(" -eden <size>[mk] set eden memory to bytes\n"); + printf(" -leakcheck num check for leaks in the heap\n"); printf(" -stackpages num use n stack pages\n"); - printf(" -breaksel selector set breakpoint on send of selector\n"); #endif #if COGVM printf(" -codesize <size>[mk] set machine code memory to bytes\n"); Modified: branches/Cog/platforms/Mac OS/vm/sqMacWindowUniversal.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacWindowUniversal.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Mac OS/vm/sqMacWindowUniversal.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -234,15 +234,13 @@ if (gSqueakHeadless && !browserActiveAndDrawingContextOk()) return 0; giLocker = interpreterProxy->ioLoadFunctionFrom("getUIToLock", ""); if (giLocker != 0) { - sqInt *foo; - foo = malloc(sizeof(sqInt)*4); + sqInt foo[4]; foo[0] = 1; foo[1] = (sqInt) ioSetFullScreenActual; foo[2] = fullScreen; foo[3] = 0; ((sqInt (*) (void *)) giLocker)(foo); return_value = interpreterProxy->positive32BitIntegerFor(foo[3]); - free(foo); } return return_value; } @@ -368,14 +366,12 @@ if (gSqueakHeadless && browserActiveAndDrawingContextOkAndNOTInFullScreenMode()) return; giLocker = interpreterProxy->ioLoadFunctionFrom("getUIToLock", ""); if (giLocker != 0) { - sqInt *foo; - foo = malloc(sizeof(sqInt)*4); + sqInt foo[4]; foo[0] = 1; foo[1] = (sqInt) sqShowWindowActual; foo[2] = windowIndex; foo[3] = 0; ((sqInt (*) (void *)) giLocker)(foo); - free(foo); } } Modified: branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2011-05-31 20:26:50 UTC (rev 2384) @@ -131,7 +131,7 @@ #define warnPrintf printf /* Thread support for thread-safe signalSemaphoreWithIndex and/or the COGMTVM */ -#if STACKVM +#if STACKVM || NewspeakVM # define sqLowLevelYield() sched_yield() # include <pthread.h> # define sqOSThread pthread_t @@ -157,7 +157,7 @@ # define ioTransferTimeslice() sched_yield() # define ioMilliSleep(ms) usleep((ms) * 1000) # endif /* COGMTVM */ -#endif /* STACKVM */ +#endif /* STACKVM || NewspeakVM */ #ifdef BROWSERPLUGIN # undef insufficientMemorySpecifiedError @@ -179,7 +179,9 @@ #ifdef __GNUC__ # undef EXPORT # define EXPORT(returnType) __attribute__((visibility("default"))) returnType -# define VM_LABEL(foo) asm("\n.globl L" #foo "\nL" #foo ":") +# if !defined(VM_LABEL) +# define VM_LABEL(foo) asm("\n.globl L" #foo "\nL" #foo ":") +# endif #endif #if !defined(VM_LABEL) || COGVM Modified: branches/Cog/platforms/unix/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/unix/vm/sqPlatformSpecific.h 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/unix/vm/sqPlatformSpecific.h 2011-05-31 20:26:50 UTC (rev 2384) @@ -60,7 +60,7 @@ #define warnPrintf printf /* Thread support for thread-safe signalSemaphoreWithIndex and/or the COGMTVM */ -#if STACKVM +#if STACKVM || NewspeakVM # define sqLowLevelYield() sched_yield() /* linux's sched.h defines clone that conflicts with the interpreter's */ # define clone NameSpacePollutant @@ -89,7 +89,7 @@ # define ioTransferTimeslice() sched_yield() # define ioMilliSleep(ms) usleep((ms) * 1000) # endif /* COGMTVM */ -#endif /* STACKVM */ +#endif /* STACKVM || NewspeakVM */ #include <sys/types.h> @@ -114,7 +114,9 @@ #define fseek fseeko #if defined(__GNUC__) -# define VM_LABEL(foo) asm("\n.globl L" #foo "\nL" #foo ":") +# if !defined(VM_LABEL) +# define VM_LABEL(foo) asm("\n.globl L" #foo "\nL" #foo ":") +# endif #else # if HAVE_ALLOCA_H # include <alloca.h> Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -576,8 +576,10 @@ dataSize= preSnapshot(); writeImageFile(dataSize); +#if STACKVM printf("\nMost recent primitives\n"); dumpPrimTraceLog(); +#endif fprintf(stderr, "\n"); printCallStack(); fprintf(stderr, "\nTo recover valuable content from this image:\n"); @@ -809,8 +811,10 @@ } else printf("\nCan't dump Smalltalk stack(s). Not in VM thread\n"); +#if STACKVM printf("\nMost recent primitives\n"); dumpPrimTraceLog(); +#endif fflush(stdout); } @@ -1261,6 +1265,15 @@ else if (!strcmp(argv[0], "-plugins")) { squeakPlugins= strdup(argv[1]); return 2; } else if (!strcmp(argv[0], "-encoding")) { setEncoding(&sqTextEncoding, argv[1]); return 2; } else if (!strcmp(argv[0], "-pathenc")) { setEncoding(&uxPathEncoding, argv[1]); return 2; } +#if STACKVM && !COGVM || NewspeakVM + else if (!strcmp(argv[0], "-sendtrace")) { extern sqInt sendTrace; sendTrace = 1; return 1; } +#endif +#if STACKVM || NewspeakVM + else if (!strcmp(argv[0], "-breaksel")) { + extern void setBreakSelector(char *); + setBreakSelector(argv[1]); + return 2; } +#endif #if STACKVM else if (!strcmp(argv[0], "-eden")) { extern sqInt desiredEdenBytes; @@ -1274,10 +1287,6 @@ extern sqInt desiredNumStackPages; desiredNumStackPages = atoi(argv[1]); return 2; } - else if (!strcmp(argv[0], "-breaksel")) { - extern void setBreakSelector(char *); - setBreakSelector(argv[1]); - return 2; } else if (!strcmp(argv[0], "-noheartbeat")) { extern sqInt suppressHeartbeatFlag; suppressHeartbeatFlag = 1; @@ -1347,8 +1356,12 @@ printf(" -help print this help message, then exit\n"); printf(" -memory <size>[mk] use fixed heap size (added to image size)\n"); printf(" -mmap <size>[mk] limit dynamic heap size (default: %dm)\n", DefaultMmapSize); +#if STACKVM || NewspeakVM + printf(" -breaksel selector set breakpoint on send of selector\n"); +#endif #if STACKVM printf(" -eden <size>[mk] use given eden size\n"); + printf(" -leakcheck num check for leaks in the heap\n"); printf(" -stackpages <num> use given number of stack pages\n"); #endif printf(" -noevents disable event-driven input support\n"); Modified: branches/Cog/platforms/win32/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/win32/vm/sqPlatformSpecific.h 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/win32/vm/sqPlatformSpecific.h 2011-05-31 20:26:50 UTC (rev 2384) @@ -84,7 +84,7 @@ #endif /* Thread support for thread-safe signalSemaphoreWithIndex and/or the COGMTVM */ -#if STACKVM +#if STACKVM || NewspeakVM # define sqLowLevelYield() Sleep(0) /* these are used both in the STACKVM & the COGMTVM */ # define sqOSThread void * @@ -102,10 +102,12 @@ # define ioTransferTimeslice() Sleep(0) # define ioMilliSleep(ms) Sleep(ms) # endif /* COGMTVM */ -#endif /* STACKVM */ +#endif /* STACKVM || NewspeakVM */ #if defined(__GNUC__) -# define VM_LABEL(foo) asm("\n.globl L" #foo "\nL" #foo ":") +# if !defined(VM_LABEL) +# define VM_LABEL(foo) asm("\n.globl L" #foo "\nL" #foo ":") +# endif #endif #if !defined(VM_LABEL) || COGVM # undef VM_LABEL Modified: branches/Cog/platforms/win32/vm/sqWin32Exports.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Exports.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/win32/vm/sqWin32Exports.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -1,8 +1,11 @@ #include <stdio.h> +#include "interp.h" +#if !NewspeakVM int win32JoystickDebugInfo(void); int win32JoystickDebugPrintRawValues(void); int win32JoystickDebugPrintAlternativeValues(void); +#endif int win32DebugPrintSocketState(void); int primitivePluginBrowserReady(void); int primitivePluginRequestURLStream(void); @@ -18,9 +21,11 @@ extern int fUseOpenGL; void *os_exports[][3] = { +#if !NewspeakVM {"","win32JoystickDebugInfo", win32JoystickDebugInfo}, {"","win32JoystickDebugPrintRawValues", win32JoystickDebugPrintRawValues}, {"","win32JoystickDebugPrintAlternativeValues", win32JoystickDebugPrintAlternativeValues}, +#endif {"","win32DebugPrintSocketState", win32DebugPrintSocketState}, {"","primitivePluginBrowserReady", primitivePluginBrowserReady}, {"","primitivePluginRequestURLStream", primitivePluginRequestURLStream}, Modified: branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -401,7 +401,7 @@ if(timeGetDevCaps(&tCaps,sizeof(tCaps)) != 0) return; dwTimerPeriod = max(tCaps.wPeriodMin,beatMilliseconds); - if(timeBeginPeriod(dwTimerPeriod) != 0) + if (timeBeginPeriod(dwTimerPeriod) != 0) return; timerID = timeSetEvent( dwTimerPeriod, 0, Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -796,6 +796,7 @@ fprintf(optionalFile,"\nCan't dump Smalltalk stack. Not in VM thread\n"); } +#if STACKVM static void dumpPrimTrace(FILE *optionalFile) { @@ -814,6 +815,9 @@ printf("\n"); } } +#else +# define dumpPrimTrace(f) 0 +#endif void printCommonCrashDumpInfo(FILE *f) { @@ -1145,12 +1149,17 @@ /****************************************************************************/ /* sqMain */ /****************************************************************************/ +#if STACKVM && !COGVM || NewspeakVM +extern sqInt sendTrace; +#endif +#if STACKVM || NewspeakVM +extern sqInt checkForLeaks; +extern void setBreakSelector(char *); +#endif /* STACKVM || NewspeakVM */ #if STACKVM extern sqInt desiredNumStackPages; extern sqInt desiredEdenBytes; extern sqInt suppressHeartbeatFlag; -extern sqInt checkForLeaks; -extern void setBreakSelector(char *); #endif /* STACKVM */ #if COGVM extern sqInt desiredCogCodeSize; @@ -1167,12 +1176,17 @@ { ARG_FLAG, &fHeadlessImage, "-headless" }, /* do we run headless? */ { ARG_STRING, &logName, "-log:" }, /* VM log file */ { ARG_UINT, &dwMemorySize, "-memory:" }, /* megabyte of memory to use */ +#if STACKVM && !COGVM || NewspeakVM + { ARG_FLAG, &sendTrace, "-sendtrace"}, +#endif +#if STACKVM || NewspeakVM + { ARG_STRING_FUNC, setBreakSelector, "-breaksel:"}, /* break-point selector string */ +#endif /* STACKVM || NewspeakVM */ #if STACKVM + { ARG_UINT, &checkForLeaks, "-leakcheck:"}, /* leak check on GC */ { ARG_UINT, &desiredEdenBytes, "-eden:" }, /* bytes of eden to use */ { ARG_UINT, &desiredNumStackPages, "-stackpages:"}, /* n stack pages to use */ - { ARG_UINT, &checkForLeaks, "-leakcheck:"}, /* leak check on GC */ { ARG_FLAG, &suppressHeartbeatFlag, "-noheartbeat"}, /* no heartbeat for dbg */ - { ARG_STRING_FUNC, setBreakSelector, "-breaksel:"}, /* break-point selector string */ #endif /* STACKVM */ #if COGVM { ARG_UINT, &desiredCogCodeSize, "-codesize:"}, /* machine code memory to use */ Modified: branches/Cog/platforms/win32/vm/sqWin32Prefs.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Prefs.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/win32/vm/sqWin32Prefs.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -286,7 +286,9 @@ } void CreatePrefsMenu(void) { +#if STACKVM extern sqInt recordPrimTraceFunc(); +#endif HMENU hMenu,pMenu; vmPrefsMenu = pMenu = CreatePopupMenu(); @@ -363,9 +365,11 @@ TEXT("Dump call stack")); AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_PRINTALLSTACKS, TEXT("Dump all processes")); +#if STACKVM if (recordPrimTraceFunc()) AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_DUMPPRIMLOG, TEXT("Dump recent primitives")); +#endif AppendMenu(pMenu, MF_STRING | MF_POPUP, (int)hMenu, TEXT("Debug Options")); } @@ -455,11 +459,13 @@ printf("Printing all processes:\n"); printAllStacks(); break; +#if STACKVM case ID_DUMPPRIMLOG: { extern void dumpPrimTraceLog(void); printf("Printing recent primitives:\n"); dumpPrimTraceLog(); break; } +#endif case ID_PRIORITYBOOST: fPriorityBoost = !fPriorityBoost; SetPriorityBoost(); Modified: branches/Cog/platforms/win32/vm/sqWin32Window.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Window.c 2011-04-28 01:16:17 UTC (rev 2383) +++ branches/Cog/platforms/win32/vm/sqWin32Window.c 2011-05-31 20:26:50 UTC (rev 2384) @@ -1539,6 +1539,9 @@ if(fRunService && !fWindows95) return 1; +#if NewspeakVM + return ioDrainEventQueue(); +#else /* WinCE doesn't retrieve WM_PAINTs from the queue with PeekMessage, so we won't get anything painted unless we use GetMessage() if there is a dirty rect. */ @@ -1566,8 +1569,73 @@ } lastMessage = NULL; return 1; +#endif } +#if NewspeakVM +sqInt +ioDrainEventQueue(void) +{ static MSG msg; + POINT mousePt; + + /* + * Callback support; ensure ioProcessEvents is non-reentrant to prevent + * callbacks being delivered during other earlier callbacks. + */ + + if(fRunService && !fWindows95) return 1; + + /* WinCE doesn't retrieve WM_PAINTs from the queue with PeekMessage, + so we won't get anything painted unless we use GetMessage() if there + is a dirty rect. */ + lastMessage = &msg; + while(PeekMessage(&msg,NULL,0,0,PM_NOREMOVE)) + { + GetMessage(&msg,NULL,0,0); +#ifndef NO_PLUGIN_SUPPORT + if(msg.hwnd == NULL) { + pluginHandleEvent(&msg); + } else +#endif + if(msg.hwnd != stWindow) { + /* Messages not sent to Squeak window */ + if(msg.hwnd != consoleWindow && GetParent(msg.hwnd) == stWindow) { + /* This message has been sent to a plugin window */ + /* Selectively pass up certain events to the parent's level */ + switch (msg.message) { + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MOUSEMOVE: + mousePt.x = LOWORD(msg.lParam); + mousePt.y = HIWORD(msg.lParam); + MapWindowPoints(msg.hwnd, stWindow, &mousePt, 1); + PostMessage(stWindow, msg.message, msg.wParam, MAKELONG(mousePt.x,mousePt.y)); + } + } + } + TranslateMessage(&msg); + DispatchMessage(&msg); + } + +#ifndef NO_DIRECTINPUT + /* any buffered mouse input which hasn't been processed is obsolete */ + DumpBufferedMouseTrail(); +#endif + + /* If we're running in a browser check if the browser's still there */ + if(fBrowserMode && browserWindow) { + if(!IsWindow(browserWindow)) ioExit(); + } + lastMessage = NULL; + return 1; +} +#endif /* NewspeakVM */ + + /* returns the size of the Squeak window */ int ioScreenSize(void) { @@ -3106,12 +3174,14 @@ TEXT("\n\t-headless \t\t(force Squeak to run headless)") TEXT("\n\t-log: LogFile \t\t(use LogFile for VM messages)") TEXT("\n\t-memory: megaByte \t(set memory to megaByte MB)") +#if STACKVM || NewspeakVM + TEXT("\n\t-breaksel: string \t(set breakSelector to sel for debug)") +#endif /* STACKVM || NewspeakVM */ #if STACKVM + TEXT("\n\t-leakcheck: n \t(leak check on GC (1=full,2=incr,3=both))") TEXT("\n\t-eden: bytes \t(set eden memory size to bytes)") TEXT("\n\t-stackpages: n \t(use n stack pages)") - TEXT("\n\t-leakcheck: n \t(leak check on GC (1=full,2=incr,3=both))") TEXT("\n\t-noheartbeat \t(no heartbeat for debug)") - TEXT("\n\t-breaksel: string \t(set breakSelector to sel for debug)") #endif /* STACKVM */ #if COGVM TEXT("\n\t-codesize: bytes \t(set machine-code memory size to bytes)")

3 2

VM Maker: VMMaker.oscog-eem.68.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 31 May '11

31 May '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/VMMaker.oscog-eem.68.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.68 Author: eem Time: 31 May 2011, 1:47:28 am UUID: 1fd12e1a-c0b3-4d41-91bb-26f029240bfe Ancestors: VMMaker-eem.743, VMMaker.oscog-dtl.67, VMMaker.oscog-eem.56 Add NewspeakInterpreter to this package. Needs rev 2384 or better of http://www.squeakvm.org/svn/squeak/branches/Cog. Move some methods up from NewObjectMemory to ObjectMemory. Merge with VMMaker.oscog-dtl.58/59/64/67. Fix potential bug in Cogit's primitiveFlushCacheByMethod (must flush at cache). Move some context-specific primitives to StackInterpreterPrimitives from InterpreterPrimitives. Streamline booleanCheatTrue & booleanCheatFalse (no need to decrement localIP and refetch byte). Drop use of CrLfFileStream. Fix arg count bug in BalloonEnginePlugin>>primitiveAddPolygon. Add Mac VMProfiler support plugin, but call it VMProfileMacSupportPlugin. Add STACKVM, COGVM & COGMTVM as simulation-time constants (not just interp.h constants) and use them to select correct stack direction for Alien callout prims in IA32ABIPlugin. Make sure movement fiunctions in IA32ABIPlugin cope with backwards copying (e.g. use memmove over memcpy). Add InterpreterPrimitives>>signalNoResume: for callback serialization. Limit simulation screen size to 2/3 of the actual screen. Provide VMMaker class>>makerFor:and:to:platformDir:including: for more predictable plugin generation. Move some Object VMMaker-translation extensions down into VMClass. Reorganize all moduleName and prepareMethods plugin methods to same protocol. Minor formatting of VMMaker generation-time errors and warnings. Use literalAt; in place of literals first.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2011