Vm-dev September 2014

vm-dev@lists.squeakfoundation.org

25 participants
90 discussions

Re: [Pharo-dev] [Vm-dev] re: Parsing Pharo syntax to C/C++
by phil＠highoctane.be 16 Sep '14

16 Sep '14

On Tue, Sep 16, 2014 at 1:48 PM, Thierry Goubier <thierry.goubier(a)gmail.com> wrote: > > > > 2014-09-16 13:14 GMT+02:00 Ben Coman <btc(a)openinworld.com>: >> >> >> Don't worry/don't bother with thoses: you will never use Smalltalk or a VM :) It will never be certified by authorities, and the industry will never accept it. >> >> >> You are probably right for those two examples, but there are other not-so-regulated domains where real-time is useful - e.g. industrial automation and robotics. > > > Real-time is usefull there, yes. But Smalltalk and Cog will never get there. Except as a DSL / code generator tool (which means a MDE approach, more or less). > > (And code generation is where Pharo to C or LLVM-IR gets us interested) > > Dynamic optimisations, lack of static typing: they will laugh you out in any of those fields. > > Even if their developpers use Python behind their back. > http://www.altreonic.com/ has OpenComRTOSwhich looks the kind of thing we would like to target then. I know the creator of OpenCOMRTOS, in fact, he lives close to my place. http://www.altreonic.com/sites/default/files/Altreonic%20OpenComRTOS2013.pdf They happen to have a "VM" http://www.altreonic.com/sites/default/files/Altreonic%20Safe%20Virtual%20M… "The ultra small target independent Virtual Machine" Applications:  Remote diagnostics.  Fail safe and fault tolerant control.  Processor independent programming. Thanks to the use of OpenComRTOS, SafeVM tasks can operate system wide across all nodes in the network. The user can also put several SafeVM tasks on the same node. The natively running OpenComRTOS itself acts as a virtual machine for the SVM tasks, isolating them from the underlying hardware details while providing full access. Safe Virtual Machine for C So, looks like we aren't in such a black and white situation. Phil > > Thierry

1 0

Re: [squeak-dev] Mac VM build (was: [ANN] FunZqueak 4.6 alpha for try)
by David T. Lewis 16 Sep '14

16 Sep '14

Looking for xcodeproj for Squeak 4.2.5beta1U Mac VM, see below: On Mon, Sep 15, 2014 at 02:51:34PM -0500, Javier Diaz-Reinoso wrote: > On 14/09/2014, at 16:43, David T. Lewis <lewis(a)mail.msen.com> wrote: > > > > > > > On Sun, Sep 14, 2014 at 12:43:51PM -0500, Javier Diaz-Reinoso wrote: > >> On 13/09/2014, at 13:34, David T. Lewis <lewis(a)mail.msen.com> wrote: > >> > >>> ... > >>> Of course it does work with the interpreter VM also. But some people > >>> (including Edgar) have older Macs, and they are stuck with using a very > >>> outdated VM on those machines. If anyone with good working knowledge of > >>> Mac development would like to build an updated Mac interpreter VM, it > >>> would be much appreciated. It's not something that I know how to do, but > >>> I'm sure someone must have the skills and experience to be able to do > >>> this. > >>> > >>> Dave > >>> > >> > >> In this moment I have an old mac mini ppc loaded with Xcode 3.1.4 who > >> is the last version that works on PPC, so I can try to generate an 32 bit > >> fat binary (ppc/x86) if you can point me to the last svn. > > > > Javier, > > > > Thank you! I am cc'ing the vm-dev list also. > > > > The most up to date SVN is here: > > > > svn co http://squeakvm.org/svn/squeak/trunk/platforms > > svn co http://squeakvm.org/svn/squeak/trunk/src > > > > The trunk/platforms tree will give you the platforms sources for all > > platforms. If you want just the Mac OS parts, it would be: > > > > svn co http://squeakvm.org/svn/squeak/trunk/platforms/Cross > > svn co http://squeakvm.org/svn/squeak/trunk/platforms/Mac\ OS > > > > The trunk/src tree contains sources generated from a VMMaker image > > to match the platforms sources in trunk/platforms. You may prefer to > > generate these yourself, but the most recent sources in trunk/src > > will match the most recent sources in trunk/platforms, and I expect > > that they should work for you, even though I have tested them only > > on Unix (Linux), not Mac OS with Xcode. > > > > The directory structure in trunk/src will probably not match the > > organization of the Xcode project, so you may need to copy files or > > reorganize them for Xcode. > > > > The Mac OS VM has support for some things (plugins?) that may not > > be present in the trunk/src files. If so I will do my best to help > > you find them, or perhaps you will be able to use the original code > > from the last Mac OS build. > The problem is the trunk version don't have the resources directory and the SqueakVMForCarbon.xcodeproj (someone delete this files), the resource directory can be recreated, but recreating the xcodeproj is a ugly work. > > So what I need to proceed is a copy of the files of Squeak 4.2.5beta1U (or at least from a older version of 4.2) who include the resource/xcodeproj. Javier, The 42.5beta1U release is at http://squeakvm.org/mac/release/Squeak%204.2.5beta1U.zip but this does not include the resource/xcodeproj file. I am CC'ing the vm-dev list in hopes that someone on the list has a copy of the development files. vm-dev: Does anyone have, or know how to get, a copy of the Mac xcode project that was used to build the 4.5beta1U Mac VM? Thanks! Dave > > > > Thank you very much for offering to help with this. I think there > > are quite a few people with older Macs who would really appreciate > > this update. > > > > Dave > > > > >

1 0

Re: [squeak-dev] Re: How can I listen to my app?
by Eliot Miranda 16 Sep '14

16 Sep '14

On Mon, Sep 15, 2014 at 5:24 PM, David T. Lewis <lewis(a)mail.msen.com> wrote: > Apologies for the confusion but to summarize what I found: > > - The 32-bit standard interpreter VM for Linux on squeakvm.org has all of > the > usual vm-sound-* modules, and should work as expected. > > http://squeakvm.org/unix/release/Squeak-4.10.2.2614-linux_i386.tar.gz > > - The 64-bit standard interpreter VM for Linux on squeakvm.org is missing > some > of the vm-sound-* modules. For this reason, if you downloaded an > interpreter > VM for your 64-bit Linux system, you may not have sound. > > > http://squeakvm.org/unix/release/Squeak-4.10.2.2614-linux_x86_64.tar.gz > > - If you have the 64-bit intepreter VM, you should be able to replace it > with the 32-bit interpreter VM if you need sound. Or, if you prefer to > keep the 64-bit VM, you may be able to add the attached vm-sound modules > from a VM that I compiled on my PC. YMMV, absolutely no guarantees. > > - For Cog, there may be a problem with the build procedure that is causing > problems with the vm-sound-* modules. I do not yet know the reason, > although you may be able to use the vm-sound-* modules from the 32-bit > interpreter VM (I think there was a success report for this earlier in > this thread). > There is no "problem" with the pulse sound build on linux in Cog because... no one added it to the Cog tree. It fell throguh the cacks when the Qwaq VM diverged. Ian Piumarta added it in September 2009 at which time Cog was internal. > HTH, > > Dave > > On Mon, Sep 15, 2014 at 11:57:05AM -0400, David T. Lewis wrote: > > Hi St?phane, > > > > I am travelling, so I cannot post anything now. But I will send you a > copy > > of the missing vm-sound modules as soon as I can. > > > > I prefer not to post a compiled VM, because I think this should come from > > squeakvm.org/unix if possible. That said, I had not realized that we > were > > missing some sound modules from the last official build, so we should > make > > this available as a fix. > > > > Are you able to compile programs on your own Linux box? It's really quite > > easy to make an interpreter VM nowadays, and I would be happy show you > how > > to do this if you are willing to give it a try. > > > > Dave > > > > > > > >> My apologies to Ubuntu, it seems that I neglected to install the sound > > >> development libraries on my Ubuntu laptop before compiling the VM. > That > > >> done, sound works fine with the -vm-sound-pulse driver on Ubuntu. > > > > > > Could you please make this binary available somewhere ? > > > > > > Best, > > > > > > Stef > > > > > > > > > > > > -- best, Eliot

3 2

[commit][3080] Copy squeakvm trunk' s linux PulseAudio system and provide autoconf support.
by commits＠squeakvm.org 16 Sep '14

16 Sep '14

Revision: 3080 Author: eliot Date: 2014-09-15 19:54:54 -0700 (Mon, 15 Sep 2014) Log Message: ----------- Copy squeakvm trunk's linux PulseAudio system and provide autoconf support. Untested! Added Paths: ----------- branches/Cog/platforms/unix/vm-sound-pulse/ branches/Cog/platforms/unix/vm-sound-pulse/Makefile.inc branches/Cog/platforms/unix/vm-sound-pulse/acinclude.m4 branches/Cog/platforms/unix/vm-sound-pulse/config.cmake branches/Cog/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c Added: branches/Cog/platforms/unix/vm-sound-pulse/Makefile.inc =================================================================== --- branches/Cog/platforms/unix/vm-sound-pulse/Makefile.inc (rev 0) +++ branches/Cog/platforms/unix/vm-sound-pulse/Makefile.inc 2014-09-16 02:54:54 UTC (rev 3080) @@ -0,0 +1 @@ +PLIBS=-lpulse-simple Added: branches/Cog/platforms/unix/vm-sound-pulse/acinclude.m4 =================================================================== --- branches/Cog/platforms/unix/vm-sound-pulse/acinclude.m4 (rev 0) +++ branches/Cog/platforms/unix/vm-sound-pulse/acinclude.m4 2014-09-16 02:54:54 UTC (rev 3080) @@ -0,0 +1,9 @@ +# -*- sh -*- + +AC_MSG_CHECKING([for PulseAudio]) +AC_TRY_COMPILE([#include <pulse/simple.h>],[(void)pa_simple_new;],[ + AC_MSG_RESULT(yes) +],[ + AC_MSG_RESULT(no) + AC_PLUGIN_DISABLE +]) Added: branches/Cog/platforms/unix/vm-sound-pulse/config.cmake =================================================================== --- branches/Cog/platforms/unix/vm-sound-pulse/config.cmake (rev 0) +++ branches/Cog/platforms/unix/vm-sound-pulse/config.cmake 2014-09-16 02:54:54 UTC (rev 3080) @@ -0,0 +1 @@ +PLUGIN_REQUIRE_LIBRARY (PULSE pulse-simple) Added: branches/Cog/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c =================================================================== --- branches/Cog/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c (rev 0) +++ branches/Cog/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c 2014-09-16 02:54:54 UTC (rev 3080) @@ -0,0 +1,1179 @@ +/* sqUnixSoundPulseAudio.c -- sound module for Pulse Audio + * + * Author: Derek O'Connell <doc(a)doconnel.f9.co.uk> + * + * Copyright (C) 2009--2010 by Derek O'Connell + * 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. + * + * Last edited: 2014-03-07 08:25:10 by piumarta on emilia.local + */ + +/* ========== */ +/* INCLUDES */ +/* ========== */ + +#include "sq.h" +#include <errno.h> +#include <signal.h> + +#include <stdio.h> +#include <stdlib.h> +#include <sys/errno.h> +#include <sys/mman.h> +#include <string.h> +#include <unistd.h> + +/* +#include <glib.h> +*/ +#include <pthread.h> + +#include <pulse/simple.h> +#include <pulse/error.h> +/* +#include <pulse/gccmacro.h> +*/ + +/* ========== */ +/* MACROS */ +/* ========== */ + +#define FAIL(X) \ +{ \ + success(false); \ + return X; \ +} + +#define snd(expr, what) \ + if ((rc = snd_##expr) < 0) \ + { \ + fprintf(stderr, "%s: %s\n", what, snd_strerror(rc)); \ + success(false); \ + return rc; \ + } + + +/* ================================== DEBUGGING */ + +#define xDBG + +#ifdef DBG + #define DBG_MSG_MAX_LEN 128 + + char *dbg_msg[DBG_MSG_MAX_LEN]; + + #define DBGMSG(M) { \ + printf("DBG: sqUnixSoundMaemo: %s (%d, %s)\n", M, errno, strerror (errno)); \ + errno = 0; \ + } + + #define DBGERR(M, E) { \ + sprintf(*dbg_msg, M, E); \ + DBGMSG(dbg_msg); \ + } + +#else + #define DBGMSG(M) + #define DBGERR(M, E) +#endif + + +/* ================================== TYPES */ + +typedef struct { + short *buffer; + unsigned long samples; + int isFree; +} audioBuffer_t; + +typedef struct { + pthread_mutex_t *mutex; + pthread_cond_t *cond; + unsigned int count; +} gen_sig_t; + +typedef struct { + /* Left in for debugging >>> */ + const char *dbgName; + const char *device; + /* <<< */ + + int open; + + unsigned long maxSamples; + unsigned long maxWords; + unsigned long maxBytes; + + audioBuffer_t *buffer; + + int maxBuffers; + int buffersAllocated; + int bufferFree; + int bufferNext; + int bufferCount; + int bufferFull; + + pthread_mutex_t *bufferMutex; + + void * threadFunc; + pthread_t thread; + + gen_sig_t sigRun; + gen_sig_t sigStalled; + + int running; + int exit; + int stall; + int sqSemaphore; + + int rateID; + int bytesPerFrame; + + /* PULSE, Simple API parameters */ + pa_simple *pa_conn; + int dummy; + pa_sample_spec pa_spec; + } audioIO_t; + + +/* ================================== FUNCTION PROTOTYPES */ + +static int rate(int rateID); +static int rateID(int rate); + +static inline unsigned short _swapw(unsigned short v); /* From io.h */ + +static int devInputReady(int dev_fd); + +static void sigWait(gen_sig_t *sig); +static void sigReset(gen_sig_t *sig); +static void sigSignal(gen_sig_t *sig); + +static void ioThreadWaitToRun(audioIO_t *audioIO); +static void ioThreadExit(audioIO_t *audioIO); +static int ioThreadStart(audioIO_t *audioIO); +static int ioThreadIsRunning(audioIO_t *audioIO); +static void ioThreadStall(audioIO_t *audioIO); + +static void ioZeroBuffers(audioIO_t *audioIO); +static void ioFreeBuffers(audioIO_t *audioIO); +static int ioFreeBytes(audioIO_t *audioIO); +static int ioIsFull(audioIO_t *audioIO); +static int ioAddPlayBuffer(void *buffer, int frameCount); +static int ioGetRecordBuffer(void *buffer, int bufferBytes); +static int ioAllocBuffers(audioIO_t *audioIO, int frameCount); +static int ioGetBufferData(audioIO_t *audioIO, void **buffer, int *frames); +static int ioNextBuffer(audioIO_t *audioIO); + +static void *writerThread(void *ptr); +static void *readerThread(void *ptr); + +static int ioInit(); + +/* SQUEAK INTERFACE */ + +static int trace(); + +static sqInt sound_AvailableSpace(void); +static sqInt sound_InsertSamplesFromLeadTime(sqInt frameCount, void *srcBufPtr, sqInt samplesOfLeadTime); +static sqInt sound_PlaySamplesFromAtLength(sqInt frameCount, void *arrayIndex, sqInt startIndex); +static sqInt sound_PlaySilence(void); +static sqInt sound_Start(sqInt frameCount, sqInt samplesPerSec, sqInt stereo, sqInt semaIndex); +static sqInt sound_Stop(void); + +static sqInt sound_StartRecording(sqInt desiredSamplesPerSec, sqInt stereo, sqInt semaIndex); +static sqInt sound_StopRecording(void); +static double sound_GetRecordingSampleRate(void); +static sqInt sound_RecordSamplesIntoAtLength(void *buf, sqInt startSliceIndex, sqInt bufferSizeInBytes); + +static int mixer_open(char *name); +static void mixer_close(void); +static inline void mixer_getVolume(char *name, int captureFlag, double *leftLevel, double *rightLevel); +static inline void mixer_setVolume(char *name, int captureFlag, double leftLevel, double rightLevel); +static int mixer_setSwitch(char *name, int captureFlag, int parameter); +static int mixer_getSwitch(char *name, int captureFlag, int channel); +static void sound_Volume(double *left, double *right); +static void sound_SetVolume(double left, double right); +static sqInt sound_SetRecordLevel(sqInt level); +static sqInt sound_SetDevice(sqInt id, char *arg); +static sqInt sound_GetSwitch(sqInt id, sqInt captureFlag, sqInt channel); +static sqInt sound_SetSwitch(sqInt id, sqInt captureFlag, sqInt parameter); + + +/* ==================== */ +/* ==================== GLOBALS */ +/* ==================== */ + +/* Left in but not used >>> */ +#define SQ_SND_PLAY_START_THRESHOLD 7/8 +#define SQ_SND_PLAY_AVAIL_MIN 4/8 +/* <<< */ + +/* Arbitrary (apart from minmising latency) >>> */ +#define MAX_INPUT_BUFFERS 10 +#define MAX_OUTPUT_BUFFERS 2 +/* <<< */ + +audioBuffer_t iBuffer[MAX_INPUT_BUFFERS]; +audioBuffer_t oBuffer[MAX_OUTPUT_BUFFERS]; + +/* STATICALLY INITIALISED SO AUTO-DESTROYED (ON CRASHING FOR INSTANCE) >>> */ + +/* input */ + +pthread_mutex_t audioInBufferMutex = PTHREAD_MUTEX_INITIALIZER; + +pthread_mutex_t audioInRunMutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t audioInRunCond = PTHREAD_COND_INITIALIZER; + +pthread_mutex_t audioInStalledMutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t audioInStalledCond = PTHREAD_COND_INITIALIZER; + +/* output */ + +pthread_mutex_t audioOutBufferMutex = PTHREAD_MUTEX_INITIALIZER; + +pthread_mutex_t audioOutRunMutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t audioOutRunCond = PTHREAD_COND_INITIALIZER; + +pthread_mutex_t audioOutStalledMutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t audioOutStalledCond = PTHREAD_COND_INITIALIZER; + +/* <<< */ + + +audioIO_t audioIn, audioOut; + +int initDone = false; + +/* EXTRA FOR ALSA BUT UNUSED >>> */ +/* +static int output_buffer_frames_available = 1; +static double max_delay_frames = 0; +*/ +/* <<< */ + + +/* ================================== UTILS */ + +/* RATE CONVERSION: from dsp code but not used (yet). Maybe not needed at all with AlSA */ +/* RATE CONVERSION: fixed preset rates are used. TBD: choose nearest to requested */ +/* +static int rate(int rateID) { + if (SAMPLE_RATE_8KHZ == rateID) return 8000; + if (SAMPLE_RATE_16KHZ == rateID) return 16000; + if (SAMPLE_RATE_11_025KHZ == rateID) return 11025; + if (SAMPLE_RATE_22_05KHZ == rateID) return 22050; + if (SAMPLE_RATE_44_1KHZ == rateID) return 44100; + return -1; +} + +static int rateID(int rate) { + if ( 8000 == rate) return SAMPLE_RATE_8KHZ; + if ( 8192 == rate) return SAMPLE_RATE_8KHZ; + if (16000 == rate) return SAMPLE_RATE_16KHZ; + if (11025 == rate) return SAMPLE_RATE_11_025KHZ; + if (22050 == rate) return SAMPLE_RATE_22_05KHZ; + if (44100 == rate) return SAMPLE_RATE_44_1KHZ; + return -1; +} +*/ + +/* From io.h because recorded data has to be Big Endian */ +static inline unsigned short _swapw(unsigned short v) { + return ((v << 8) | (v >> 8)); +} + + +/* Not used but maybe useful */ +/* +static int devInputReady(int dev_fd) { + struct pollfd pfd; + pfd.fd = dev_fd; + pfd.events = POLLIN; + if (poll (&pfd,1,0)>0) return true; + return false; +} +*/ + +static void printPALatency() { + pa_usec_t latency; + int error; + + if ((latency = pa_simple_get_latency(audioOut.pa_conn, &error)) == (pa_usec_t) -1) + fprintf(stderr, __FILE__": pa_simple_get_latency() failed: %s\n", pa_strerror(error)); + else + fprintf(stderr, "%0.0f usec \r", (float)latency); +} + +/* ================================== Signal Ops */ + +static void sigWait(gen_sig_t *sig) { + pthread_mutex_lock(sig->mutex); + while( !sig->count ) + pthread_cond_wait(sig->cond, sig->mutex); + sig->count -= 1; + pthread_mutex_unlock(sig->mutex); +} + +static void sigReset(gen_sig_t *sig) { + pthread_mutex_lock(sig->mutex); + sig->count = 0; + pthread_mutex_unlock(sig->mutex); +} + +static void sigSignal(gen_sig_t *sig) { + pthread_mutex_lock(sig->mutex); + sig->count += 1; + pthread_cond_signal(sig->cond); + pthread_mutex_unlock(sig->mutex); +} + +/* Here for debugging but direct calls would be ok >>> */ +static void signalSqueak(audioIO_t *audioIO) { +/* printf("@%d",audioIO->sqSemaphore); +*/ + if (0 < audioIO->sqSemaphore) + signalSemaphoreWithIndex(audioIO->sqSemaphore); +} +/* <<< */ + + +/* ================================== Thread Ops */ + +static void ioThreadExit(audioIO_t *audioIO) { + if (!audioIO->thread) return; + audioIO->exit = 1; + sigSignal(&audioIO->sigRun); + pthread_join(audioIO->thread, NULL); + audioIO->thread = 0; +} + +static int ioThreadStart(audioIO_t *audioIO) { + int rc; + if (audioIO->thread) return true; + rc = pthread_create(&audioIO->thread, NULL, audioIO->threadFunc, NULL); + if (0 != rc) DBGERR("ioThreadStart(): %d", rc); + return rc; +} + +static int ioThreadIsRunning(audioIO_t *audioIO) { + return audioIO->running; +} + +static void ioThreadStall(audioIO_t *audioIO) { + audioIO->stall = true; + sigSignal(&audioIO->sigRun); + sigWait(&audioIO->sigStalled); +} + +/* Don't attempt to signal Sq here as we may not have a semaphore! */ +static void ioThreadWaitToRun(audioIO_t *audioIO) { + sigSignal(&audioIO->sigStalled); + + pthread_mutex_lock(audioIO->sigRun.mutex); + audioIO->running = false; + + if (audioIO->stall) audioIO->sigRun.count = 0; + audioIO->stall = false; + + while( !audioIO->sigRun.count ) + pthread_cond_wait(audioIO->sigRun.cond, audioIO->sigRun.mutex); + audioIO->sigRun.count -= 1; + + audioIO->running = true; + pthread_mutex_unlock(audioIO->sigRun.mutex); + + sigReset(&audioIO->sigStalled); +} + +/* ================================== Buffer ops */ + +static void ioZeroBuffers(audioIO_t *audioIO) { + int i; + for(i=0; i < audioIO->maxBuffers; i++) { + audioIO->buffer[i].samples = 0; + audioIO->buffer[i].isFree = true; + } +} + +static void ioFreeBuffers(audioIO_t *audioIO) { + int i; + for(i=0; i < audioIO->maxBuffers; i++) { + free(audioIO->buffer[i].buffer); + audioIO->buffer[i].buffer = 0; + audioIO->buffer[i].samples = 0; + } + audioIO->bufferFree = audioIO->bufferNext = 0; + /* audioIO->bufferCount differs for play/record */ +} + +/* Only used for playing, not for recording */ +static int ioFreeBytes(audioIO_t *audioIO) { + int freeBytes; + pthread_mutex_lock(audioIO->bufferMutex); + freeBytes = audioIO->maxBytes * audioIO->bufferCount; + pthread_mutex_unlock(audioIO->bufferMutex); + return freeBytes; +} + +static int ioAllocBuffers(audioIO_t *audioIO, int frameCount) { + int i; + + /* Not preserving buffers when play/record stopped */ + /* Choosing memory conservation over speed of starting play/record */ + + ioFreeBuffers(audioIO); + audioIO->maxSamples = frameCount; + audioIO->maxBytes = audioIO->maxSamples * audioIO->bytesPerFrame; + audioIO->maxWords = audioIO->maxBytes >> 1; + for(i=0; i < audioIO->maxBuffers; i++) { + audioIO->buffer[i].buffer = (short *)calloc(audioIO->maxBytes, 1); + audioIO->buffer[i].isFree = true; + } + audioIO->buffersAllocated = true; +} + +static int ioIsFull(audioIO_t *audioIO) { + pthread_mutex_lock(audioIO->bufferMutex); + audioIO->bufferFull = (0 < audioIO->buffer[audioIO->bufferFree].samples); + pthread_mutex_unlock(audioIO->bufferMutex); + return audioIO->bufferFull; +} + +/* Could combine some of the following but makes debugging difficult */ + +static int ioAddPlayBuffer(void *buffer, int frameCount) { + long bytes; + if (ioIsFull(&audioOut)) return 0; + pthread_mutex_lock(audioOut.bufferMutex); + bytes = MIN(audioOut.maxBytes, frameCount * audioOut.bytesPerFrame); + memcpy(audioOut.buffer[audioOut.bufferFree].buffer, buffer, bytes); + audioOut.buffer[audioOut.bufferFree].samples = frameCount; + audioOut.buffer[audioOut.bufferFree].isFree = false; + audioOut.bufferFree = (audioOut.bufferFree + 1) % audioOut.maxBuffers; + audioOut.bufferCount -= 1; + pthread_mutex_unlock(audioOut.bufferMutex); + return bytes; +} + +static int ioGetRecordBuffer(void *buffer, int bufferBytes) { + long samples, sampleBytes; + + if (bufferBytes <= 0) return 0; +/* if (audioIn.buffer[audioIO->bufferNext].samples <=0) return 0; +*/ + if (audioIn.buffer[audioIn.bufferNext].isFree) return 0; + + pthread_mutex_lock(audioIn.bufferMutex); + samples = audioIn.buffer[audioIn.bufferNext].samples; + sampleBytes = MIN(2 * audioIn.pa_spec.channels * samples, bufferBytes); + memcpy(buffer, (char *)audioIn.buffer[audioIn.bufferNext].buffer, sampleBytes); + /* DMOC 090909 1800: Hmmmm, what if Squeak does not read whole buffer? ATM remaining buffer data lost since */ + /* ioGetRecordBuffer() frees the buffer after single visit. Needs more work */ + audioIn.buffer[audioIn.bufferNext].samples = 0; + audioIn.buffer[audioIn.bufferNext].isFree = true; + audioIn.bufferNext = (audioIn.bufferNext + 1) % audioIn.maxBuffers; + audioIn.bufferCount -= 1; + pthread_mutex_unlock(audioIn.bufferMutex); + return sampleBytes; +} + +static int ioGetBufferData(audioIO_t *audioIO, void **buffer, int *frames) { + if (audioIO->buffer[audioIO->bufferNext].isFree) return false; + pthread_mutex_lock(audioIO->bufferMutex); + *buffer = (void *)(audioIO->buffer[audioIO->bufferNext].buffer); + *frames = audioIO->buffer[audioIO->bufferNext].samples; + pthread_mutex_unlock(audioIO->bufferMutex); + return true; +} + +static int ioNextPlayBuffer() { + pthread_mutex_lock(audioOut.bufferMutex); + audioOut.buffer[audioOut.bufferNext].samples = 0; + audioOut.buffer[audioOut.bufferNext].isFree = true; + audioOut.bufferNext = (audioOut.bufferNext + 1) % audioOut.maxBuffers; + audioOut.stall = (audioOut.bufferNext == audioOut.bufferFree); + audioOut.bufferCount += 1; + pthread_mutex_unlock(audioOut.bufferMutex); +} + +static int ioNextRecordBuffer() { + pthread_mutex_lock(audioIn.bufferMutex); + audioIn.buffer[audioIn.bufferNext].isFree = false; + audioIn.bufferFree = (audioIn.bufferNext + 1) % audioIn.maxBuffers; + audioIn.stall = (audioIn.bufferNext == audioIn.bufferFree); + audioIn.bufferCount += 1; + pthread_mutex_unlock(audioIn.bufferMutex); +} + +/* ================================== IO THREADS */ + +static void *writerThread(void *ptr) { + struct timespec tm = {0, 1000 * 1000}; + int rc; + int nextBuffer, frames; + void *buffer; + + DBGMSG("[writerThread: started]"); + + audioOut.exit = 0; + + for (;;) { + DBGMSG("[writerThread: waiting]"); + + /* No point signalling squeak *before* running as there may not be a semaphore */ + ioThreadWaitToRun(&audioOut); + + if (audioOut.exit) break; + if (!audioOut.open || audioOut.stall) continue; + + DBGMSG("[writerThread: running]"); + + for (;;) { + if (!audioOut.open || audioOut.stall || audioOut.exit) break; + + if (!ioGetBufferData(&audioOut, &buffer, &frames)) { + signalSqueak(&audioOut); + break; + } + +/*printf("writerThread: buffer: %d, frames %d\n", audioOut.bufferNext, frames); +*/ + + while (frames > 0) { + if (!audioOut.open || audioOut.stall || audioOut.exit) break; +/* if ((rc = snd_pcm_writei(audioOut.alsaHandle, buffer, frames)) < frames) { +*/ + + /* PA: Have to assume for now that all frames were written */ + if (pa_simple_write(audioOut.pa_conn, buffer, (size_t) (frames * audioOut.bytesPerFrame), &rc) < 0) { + fprintf(stderr, __FILE__": pa_simple_write() failed: %s\n", pa_strerror(rc)); +/* printf("writerThread: sent %d, actual %d\n", frames, rc); +*/ + break; + } + + /* PA: Have to assume for now that all frames were written */ +/* buffer = (short *)((char *)buffer + rc * audioOut.bytesPerFrame); + frames -= rc; +*/ + /* *** SO FOLLOWING CODE *AND* THE ENCLOSING WHILE-LOOP REDUNDANT!!! (so just break out of loop) *** */ +/* buffer = (short *)((char *)buffer + frames * audioOut.bytesPerFrame); + frames -= frames; +*/ + break; + } /* while */ + + if (!audioOut.open || audioOut.stall || audioOut.exit) break; + ioNextPlayBuffer(); + if (!audioOut.open || audioOut.stall || audioOut.exit) break; + + signalSqueak(&audioOut); + } + + if (audioOut.exit) break; + } + + DBGMSG("[writerThread: stopped]"); + +} + + +static void *readerThread(void *ptr) { + int rc; + int wc; + unsigned short *p; + + DBGMSG("[readerThread: started]"); + + audioIn.exit = 0; + + for (;;) { + DBGMSG("[readerThread: waiting]"); + + ioThreadWaitToRun(&audioIn); + + if (audioIn.exit) break; + if (!audioIn.open || audioIn.stall) continue; + + DBGMSG("[readerThread: running]"); + + for (;;) { + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + + /* NB: PA Simple API does not return number of bytes/samples recorded */ + /* (so have to assume full buffer everytime (poss padded if less than requested) */ + +/* rc = snd_pcm_readi(audioIn.alsaHandle, audioIn.alsaBuffer, audioIn.alsaFrames); +*/ + if (pa_simple_read(audioIn.pa_conn, (char *)(audioIn.buffer[audioIn.bufferFree].buffer), audioIn.maxBytes, &rc) < 0) { + fprintf(stderr, __FILE__": pa_simple_read() failed: %s\n", pa_strerror(rc)); + continue; + } + + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + + /* PA: Assume max buffer frames returned... */ + rc = audioIn.maxSamples; + + /* EPIPE means overrun */ +/* + if (rc == -EPIPE) { + printf("readerThread: overrun occurred\n"); + snd_pcm_prepare(audioIn.alsaHandle); + continue; + } + + if (rc < 0) { + printf("readerThread: error from read: %s\n", snd_strerror(rc)); + continue; + } + + if (rc != (int)audioIn.alsaFrames) { + printf("readerThread: short read, read %d frames\n", rc); + continue; + } +*/ + if (!audioIn.buffer[audioIn.bufferFree].isFree) { + printf("readerThread: No free buffers!\n"); + continue; + } + + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + + /* PA: Complete buffer should be returned so skipping check and moving guts to end of loop */ +/* + if ((audioIn.buffer[audioIn.bufferFree].samples + rc) > audioIn.maxSamples) { + ioNextRecordBuffer(); + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + signalSqueak(&audioIn); + } +*/ + +/* Next won't get called anyway because of "stall" in ioNextRecordBuffer() */ +/* Left here in case needed for debugging */ +/* + if (!audioIn.buffer[audioIn.bufferFree].isFree) { + printf("readerThread: No free buffers!\n"); + continue; + } +*/ + + /* PA: Endian swap may not be needed... */ + + /* Endian Swap (rc = frames = Word Count in this case) */ +/* + p = (unsigned short *)(audioIn.buffer[audioIn.bufferFree].buffer); + wc = rc; + while (wc--) + *p = _swapw(*p); +*/ + + /* PA: No copy required since record buffer used directly... */ +/* + memcpy((char *)(audioIn.buffer[audioIn.bufferFree].buffer) + 2 * audioIn.buffer[audioIn.bufferFree].samples, audioIn.alsaBuffer, rc*2); + audioIn.buffer[audioIn.bufferFree].samples += rc; +*/ + + /* PA: No indication of actual bytes/samples read so assuming full buffer read (or padded)... */ + audioIn.buffer[audioIn.bufferFree].samples = audioIn.maxSamples; + + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + + /* PA: These three lines moved from above (since assuming full buffers are read every time) */ + ioNextRecordBuffer(); + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + signalSqueak(&audioIn); + + } + if (audioIn.exit) break; + } +DBGMSG("[readerThread: stopped]"); +} + + +/* ================================== IO INIT */ + +static int ioInit() { + if (initDone) return true; + initDone = true; + + /* AUDIO OUT */ + +/* NOT USED >>> */ + audioOut.dbgName = "play"; + audioOut.device = "pa-simple"; +/* <<< */ + + audioOut.open = false; + + audioOut.maxSamples = 0; + audioOut.maxWords = 0; + audioOut.maxBytes = 0; + + audioOut.maxBuffers = MAX_OUTPUT_BUFFERS; + audioOut.buffer = oBuffer; + audioOut.bufferFree = 0; + audioOut.bufferNext = 0; + audioOut.bufferCount = audioOut.maxBuffers; + audioOut.bufferFull = 0; + audioOut.bufferMutex = &audioOutBufferMutex; + audioOut.buffersAllocated = false; + + audioOut.threadFunc = writerThread; + audioOut.thread = 0; + + audioOut.sigRun.mutex = &audioOutRunMutex; + audioOut.sigRun.cond = &audioOutRunCond; + sigReset(&audioOut.sigRun); + + audioOut.sigStalled.mutex = &audioOutStalledMutex; + audioOut.sigStalled.cond = &audioOutStalledCond; + sigReset(&audioOut.sigStalled); + + audioOut.running = 0; + audioOut.exit = 0; + audioOut.stall = 0; + + audioOut.sqSemaphore = 0; + + audioOut.rateID = 0; + audioOut.bytesPerFrame = 4; /* Stereo S16LE */ + + audioOut.pa_conn = null; + + ioThreadStart(&audioOut); + + /* AUDIO IN */ + + audioIn.dbgName = "rec"; + +/* NOT USED >>> */ + audioIn.device = "pa-simple"; +/* <<< */ + + audioIn.open = false; + + audioIn.maxSamples = 0; + audioIn.maxWords = 0; + audioIn.maxBytes = 0; + + audioIn.maxBuffers = MAX_INPUT_BUFFERS; + audioIn.buffer = iBuffer; + audioIn.bufferFree = 0; + audioIn.bufferNext = 0; + audioIn.bufferCount = 0; /* No buffers yet. Was audioIn.maxBuffers; */ + audioIn.bufferFull = 0; + audioIn.bufferMutex = &audioInBufferMutex; + audioIn.buffersAllocated = false; + + audioIn.threadFunc= readerThread; + audioIn.thread = 0; + + audioIn.sigRun.mutex = &audioInRunMutex; + audioIn.sigRun.cond = &audioInRunCond; + sigReset(&audioIn.sigRun); + + audioIn.sigStalled.mutex = &audioInStalledMutex; + audioIn.sigStalled.cond = &audioInStalledCond; + sigReset(&audioIn.sigStalled); + + audioIn.running = 0; + audioIn.exit = 0; + audioIn.stall = 0; + + audioIn.sqSemaphore = 0; + + audioIn.rateID = 0; + audioIn.bytesPerFrame = 2; /* Mono S16LE */ + + audioIn.pa_conn = null; + + ioThreadStart(&audioIn); +} + +/* ============================================ */ +/* ================================== VM PLUGIN */ +/* ============================================ */ + +static int trace() { +} + +/* ================================== AUDIO OUT */ + +static sqInt sound_AvailableSpace(void) { + return ioFreeBytes(&audioOut); +} + +static sqInt sound_InsertSamplesFromLeadTime(sqInt frameCount, void *srcBufPtr, sqInt samplesOfLeadTime) { +DBGMSG(">sound_InsertSamplesFromLeadTime()"); + return 0; /* or maxBytes? */ +} + + +static sqInt sound_PlaySamplesFromAtLength(sqInt frameCount, void *srcBufPtr, sqInt startIndex) { + unsigned int bufferNext, samples, sampleBytes; + + if (0 >= frameCount) return 0; + + samples = MIN(audioOut.maxSamples, frameCount); + + if (0 == (sampleBytes = ioAddPlayBuffer(srcBufPtr + startIndex * 2 * audioOut.pa_spec.channels, samples))) + DBGMSG("sound_PlaySamplesFromAtLength(): No free buffers!"); + + sigSignal(&audioOut.sigRun); + + return samples; +} + +static sqInt sound_PlaySilence(void) { +DBGMSG(">sound_PlaySilence()"); + ioThreadStall(&audioOut); + return 0; /* or maxBytes? */ +} + + +static sqInt sound_Start(sqInt frameCount, sqInt samplesPerSec, sqInt stereo, sqInt semaIndex) { + int rc; + +DBGMSG(">sound_Start()"); + +#ifdef DBG +printf("\tframeCount: %d, samplesPerSec: %d, stereo: %d, semaIndex: %d\n", frameCount, samplesPerSec, stereo, semaIndex); +#endif + + if (audioOut.open) return true; + + audioOut.pa_spec.format = PA_SAMPLE_S16LE; + audioOut.pa_spec.rate = samplesPerSec; /* rate(SAMPLE_RATE_22_05KHZ) for Squeak */ + audioOut.pa_spec.channels = stereo ? 2 : 1; + audioOut.pa_conn = NULL; + + /* Create a new playback stream */ + if (!(audioOut.pa_conn = pa_simple_new(NULL, "Scratch", PA_STREAM_PLAYBACK, NULL, "playback", &audioOut.pa_spec, NULL, NULL, &rc))) { + fprintf(stderr, __FILE__": pa_simple_new() failed: %s\n", pa_strerror(rc)); + success(false); + return false; + } + + ioAllocBuffers(&audioOut, frameCount); + audioOut.bufferCount = audioOut.maxBuffers; /* Has to be reset everytime */ + + audioOut.sqSemaphore = semaIndex; + + audioOut.open = true; + + sigSignal(&audioOut.sigRun); + + /* error possibly left over from dsp-protocol.c code */ + /* dsp-protocol.c in current ALSA not capturing EINTR/EAGAIN */ + /* EINTR/EAGAIN from dsp-protocol.c not raised up to ALSA so not caught by ALSA */ + /* Clearing errno here to see if Squeak can continue regardless */ + errno = 0; + +DBGMSG("<sound_Start()"); + return true; +} + + +static sqInt sound_Stop(void) { + int rc; + +DBGMSG(">sound_Stop()"); + + if (!audioOut.open) return true; + audioOut.open = false; + + if (NULL == audioOut.pa_conn) return true; + + ioThreadStall(&audioOut); + + if (pa_simple_drain(audioOut.pa_conn, &rc) < 0) { + fprintf(stderr, __FILE__": pa_simple_drain() failed: %s\n", pa_strerror(rc)); + } + + if (NULL != audioOut.pa_conn) + pa_simple_free(audioOut.pa_conn); + + ioFreeBuffers(&audioOut); + + audioOut.pa_conn = NULL; + audioOut.sqSemaphore = 0; + +DBGMSG("<sound_Stop()"); + return true; +} + + + +/* ================================== AUDIO IN */ + +static sqInt sound_StartRecording(sqInt desiredSamplesPerSec, sqInt stereo, sqInt semaIndex) { + int rc; + pa_buffer_attr pa_buffer_metrics; /* For recording */ + +DBGMSG(">sound_StartRecording()"); + + if (audioIn.open) return true; + + audioIn.pa_spec.format = PA_SAMPLE_S16LE; + audioIn.pa_spec.rate = desiredSamplesPerSec; + audioIn.pa_spec.channels = stereo ? 2 : 1; + audioIn.pa_conn = NULL; + + pa_buffer_metrics.maxlength = (uint32_t) -1; + pa_buffer_metrics.tlength = (uint32_t) -1; /* playback only */ + pa_buffer_metrics.prebuf = (uint32_t) -1; /* playback only */ + pa_buffer_metrics.minreq = (uint32_t) -1; /* playback only */ + pa_buffer_metrics.fragsize = pa_usec_to_bytes(20*1000, &audioIn.pa_spec); + + /* Create the recording stream */ + if (!(audioIn.pa_conn = pa_simple_new( NULL, + "Scratch", + PA_STREAM_RECORD, + NULL, + "record", + &audioIn.pa_spec, + NULL, + &pa_buffer_metrics, + &rc))) + { + fprintf(stderr, __FILE__": pa_simple_new() failed: %s\n", pa_strerror(rc)); + success(false); + return false; + } + + /* Only rate supported on the N810 (atm) is 8000 */ +/* + audioIn.alsaRate = 8000; +*/ + + /* 20Hz update freq for Squeak sounds reasonable, so... */ + audioIn.maxSamples = audioIn.pa_spec.rate / 20; + + /* Use a buffer large enough to hold one period (assuming 2 bytes/sample) */ +/* + audioIn.alsaBufferSize = audioIn.maxSamples * 2 * audioIn.pa_spec.channels; + audioIn.alsaBuffer = (char *) malloc(audioIn.alsaBufferSize); +*/ + + /* Buffers will be filled before signalling Squeak. So rate & buffer size determined signalling freq... */ + ioAllocBuffers(&audioIn, audioIn.pa_spec.rate / 20 ); /* for Sq signalling rate of 20Hz */ + audioIn.bufferCount = 0; /* Has to be reset everytime */ + + audioIn.sqSemaphore = semaIndex; + + audioIn.open = true; + + sigSignal(&audioIn.sigRun); + +DBGMSG("<sound_StartRecording()"); + return true; +} + +static sqInt sound_StopRecording(void) { +DBGMSG(">sound_StopRecording()"); + + if (!audioIn.open) return 0; + audioIn.open = false; + + if (NULL == audioIn.pa_conn) return 1; + + ioThreadStall(&audioIn); + + pa_simple_free(audioIn.pa_conn); + + ioFreeBuffers(&audioIn); + + audioIn.pa_conn = NULL; + + audioIn.sqSemaphore = 0; + +DBGMSG("<sound_StopRecording()"); + return true; +} + +static double sound_GetRecordingSampleRate(void) { + return (double)audioIn.pa_spec.rate; +} + +static sqInt sound_RecordSamplesIntoAtLength(void *buf, sqInt startSliceIndex, sqInt bufferSizeInBytes) { + unsigned int bufferNext, bufferBytes, sampleBytes; + + bufferBytes = MAX(0, bufferSizeInBytes - (startSliceIndex * 2)); + if (0 == bufferBytes) { + printf("***(%d) sound_RecordSamplesIntoAtLength(): No space in Squeak buffer!\n", startSliceIndex); + return 0; + } + + /* DMOC 090909 1800: Hmmmm, what if Squeak does not read whole buffer? ATM remaining buffer data lost since */ + /* ioGetRecordBuffer() frees the buffer after single visit. Needs more work */ + + bufferNext = audioIn.bufferNext; /* preserved for debug output */ + sampleBytes = ioGetRecordBuffer((void *)(buf + (startSliceIndex * 2)), bufferBytes); +/* + if (0 < sampleBytes) + printf(" sound_RecordSamplesIntoAtLength(%d, %d, %d) %d, %d\n", buf, startSliceIndex, bufferSizeInBytes, bufferNext, sampleBytes); + else + printf("***sound_RecordSamplesIntoAtLength(%d, %d, %d) %d, %d\n", buf, startSliceIndex, bufferSizeInBytes, bufferNext, sampleBytes); +*/ + return MAX(0, sampleBytes)/(2 * audioIn.pa_spec.channels); +} + + +/* ================================== sound mixer */ + +/* +static int sound_nomixer = 0; +static snd_mixer_t *mixer_handle = 0; +static snd_mixer_elem_t *mixer_element = 0; +*/ + +static int mixer_open(char *name) { + trace(); + return -EACCES; +} + +static void mixer_close(void) { + trace(); +} + +static inline void mixer_getVolume(char *name, int captureFlag, double *leftLevel, double *rightLevel) { + trace(); +} + +static inline void mixer_setVolume(char *name, int captureFlag, double leftLevel, double rightLevel) { + trace(); +} + +static int mixer_setSwitch(char *name, int captureFlag, int parameter) { + trace(); + return 0; +} + +static int mixer_getSwitch(char *name, int captureFlag, int channel) { + trace(); + return -1; +} + +static void sound_Volume(double *left, double *right) { + trace(); + *left= 1.0; + *right= 1.0; +} + +static void sound_SetVolume(double left, double right) { + trace(); +} + +static sqInt sound_SetRecordLevel(sqInt level) { + trace(); + return 1; + return level; +} + +static sqInt sound_SetDevice(sqInt id, char *arg) { + trace(); + return -1; +} + +static sqInt sound_GetSwitch(sqInt id, sqInt captureFlag, sqInt channel) { + trace(); + return -1; +} + +static sqInt sound_SetSwitch(sqInt id, sqInt captureFlag, sqInt parameter) { + trace(); + return -1; +} + + +/* module */ + +#include "SqSound.h" + +SqSoundDefine(PA); + +#include "SqModule.h" + +static void sound_parseEnvironment(void) { +/* + char *ev= 0; + + sound_SetDevice(0, NULL); + sound_SetDevice(1, NULL); + sound_SetDevice(2, NULL); + + if ( getenv("SQUEAK_NOMIXER" )) sound_nomixer= 1; + if ((ev= getenv("SQUEAK_SOUNDCARD"))) sound_SetDevice(0, ev); + if ((ev= getenv("SQUEAK_PLAYBACK" ))) sound_SetDevice(1, ev); + if ((ev= getenv("SQUEAK_CAPTURE" ))) sound_SetDevice(2, ev); +*/ +} + +static int sound_parseArgument(int argc, char **argv) { +/* + if (!strcmp(argv[0], "-nomixer" )) { sound_nomixer= 1; return 1; } + else if (argv[1]) + { + if (!strcmp(argv[0], "-soundcard")) { sound_SetDevice(0, argv[1]); return 2; } + if (!strcmp(argv[0], "-playback" )) { sound_SetDevice(1, argv[1]); return 2; } + if (!strcmp(argv[0], "-capture" )) { sound_SetDevice(2, argv[1]); return 2; } + } +*/ + return 0; +} + +static void sound_printUsage(void) { + printf("\nPulseAudio <option>s: <none>\n"); +/* + printf(" -nomixer disable mixer (volume) adjustment\n"); + printf(" -soundcard <name> open the named sound card (default: %s)\n", sound_device); + printf(" -playback <name> play to the named sound device (default: %s)\n", sound_playback); + printf(" -capture <name> record from the named sound device (default: %s)\n", sound_capture); +*/ +} + +static void sound_printUsageNotes(void) { +} + +static void *sound_makeInterface(void) { +/*#ifdef NEWSIG +// sigalrm_save(); // DMOC: Being here assumes old handler same for run duration! Same for sigio handler. +//#else +// DMOC: Rethink: Signal captured once, preserved and restored when/where necessary? +// sigio_save(); +//#endif +*/ + +#ifdef USE_RESOURCE_MANAGER +printf("USE_RESOURCE_MANAGER\n"); +#endif + + ioInit(); + + return &sound_PA_itf; +} + +SqModuleDefine(sound, pulse);

1 0

Re: [squeak-dev] Re: How can I listen to my app?
by Eliot Miranda 15 Sep '14

15 Sep '14

and why is no one willing to step up and get the pulse driver working in the Cog VM? On Mon, Sep 15, 2014 at 8:57 AM, David T. Lewis <lewis(a)mail.msen.com> wrote: > Hi Stéphane, > > I am travelling, so I cannot post anything now. But I will send you a copy > of the missing vm-sound modules as soon as I can. > > I prefer not to post a compiled VM, because I think this should come from > squeakvm.org/unix if possible. That said, I had not realized that we were > missing some sound modules from the last official build, so we should make > this available as a fix. > > Are you able to compile programs on your own Linux box? It's really quite > easy to make an interpreter VM nowadays, and I would be happy show you how > to do this if you are willing to give it a try. > > Dave > > > > >> My apologies to Ubuntu, it seems that I neglected to install the sound > >> development libraries on my Ubuntu laptop before compiling the VM. That > >> done, sound works fine with the -vm-sound-pulse driver on Ubuntu. > > > > Could you please make this binary available somewhere ? > > > > Best, > > > > Stef > > > > > > > > -- best, Eliot

3 2

Mac VM build (was: [ANN] FunZqueak 4.6 alpha for try)
by David T. Lewis 14 Sep '14

14 Sep '14

On Sun, Sep 14, 2014 at 12:43:51PM -0500, Javier Diaz-Reinoso wrote: > On 13/09/2014, at 13:34, David T. Lewis <lewis(a)mail.msen.com> wrote: > > > ... > > Of course it does work with the interpreter VM also. But some people > > (including Edgar) have older Macs, and they are stuck with using a very > > outdated VM on those machines. If anyone with good working knowledge of > > Mac development would like to build an updated Mac interpreter VM, it > > would be much appreciated. It's not something that I know how to do, but > > I'm sure someone must have the skills and experience to be able to do > > this. > > > > Dave > > > > In this moment I have an old mac mini ppc loaded with Xcode 3.1.4 who > is the last version that works on PPC, so I can try to generate an 32 bit > fat binary (ppc/x86) if you can point me to the last svn. Javier, Thank you! I am cc'ing the vm-dev list also. The most up to date SVN is here: svn co http://squeakvm.org/svn/squeak/trunk/platforms svn co http://squeakvm.org/svn/squeak/trunk/src The trunk/platforms tree will give you the platforms sources for all platforms. If you want just the Mac OS parts, it would be: svn co http://squeakvm.org/svn/squeak/trunk/platforms/Cross svn co http://squeakvm.org/svn/squeak/trunk/platforms/Mac\ OS The trunk/src tree contains sources generated from a VMMaker image to match the platforms sources in trunk/platforms. You may prefer to generate these yourself, but the most recent sources in trunk/src will match the most recent sources in trunk/platforms, and I expect that they should work for you, even though I have tested them only on Unix (Linux), not Mac OS with Xcode. The directory structure in trunk/src will probably not match the organization of the Xcode project, so you may need to copy files or reorganize them for Xcode. The Mac OS VM has support for some things (plugins?) that may not be present in the trunk/src files. If so I will do my best to help you find them, or perhaps you will be able to use the original code from the last Mac OS build. Thank you very much for offering to help with this. I think there are quite a few people with older Macs who would really appreciate this update. Dave

1 0

How to think about cogit.c compile error that is consistent in both gnu an cmake builds
by gettimothy 14 Sep '14

14 Sep '14

Hi all I have done a fresh svn co http://www.squeakvm.org/svn/squeak/branches/Cog After doing that my previously successfull cmake build bit the dust. As a sanity check, I then attempted a mvm build in build.linux32x86/squeak.cog.v3/build/mvm and this bombed out. The same mvm build on an older source tree works fine. For the c build, it gripes a lot about a lot of 'x' is used but never defined and ends with: /../oscogvm/src/vm/cogit.c:1094:14: warning: 'oopisLessThan' used but never defined [enabled by default] static sqInt oopisLessThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; ^ make[1]: *** [cogit.o] Error 1 make: *** [vm/vm.a] Error 2 My cmake build (which was working prior to my svn CO of the latest) started complaining along similar lines: /..../oscogvm/src/vm/cogit.c:21286:1: error: conflicting types for 'oopisLessThan' oopisLessThan(sqInt anOop, sqInt otherOop) ^ /.../oscogvm/src/vm/cogit.c:1094:14: note: previous declaration of 'oopisLessThan' was here static sqInt oopisLessThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; ^ make[2]: *** [CMakeFiles/cog.dir/home/wm/usr/src/smalltalk/CMake.oscog/cogVMMaker/Contents/Resources/oscogvm/src/vm/cogit.c.o] Error 1 make[1]: *** [CMakeFiles/cog.dir/all] Error 2 make: *** [all] Error 2 Any pointers on how to think about this are appreciated. cheers. tty thx. tty

3 10

[commit][3079] CogVM source as per VMMaker.oscog-eem.881
by commits＠squeakvm.org 14 Sep '14

14 Sep '14

Revision: 3079 Author: eliot Date: 2014-09-13 17:02:53 -0700 (Sat, 13 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.881 Fix some conflicting return types (during generation). Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -852,7 +852,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2086,7 +2086,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.880"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.881"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36766,17 +36766,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36787,21 +36785,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36816,7 +36800,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36870,18 +36854,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38753,7 +38737,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -855,7 +855,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2089,7 +2089,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.880"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.881"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36775,17 +36775,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36796,21 +36794,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36825,7 +36809,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36879,18 +36863,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38762,7 +38746,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2325,7 +2325,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.880"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.881"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5617,6 +5617,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l292; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5634,7 +5635,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l292: /* end baseFrameReturn */; goto l291; } @@ -21553,6 +21554,7 @@ target = intOrSelector; } printStringOf(target); + /* return self */ } } } @@ -65160,7 +65162,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -65406,7 +65408,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -65462,7 +65464,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2328,7 +2328,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.880"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.881"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5626,6 +5626,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l292; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5643,7 +5644,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l292: /* end baseFrameReturn */; goto l291; } @@ -21562,6 +21563,7 @@ target = intOrSelector; } printStringOf(target); + /* return self */ } } } @@ -65169,7 +65171,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -65415,7 +65417,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -65471,7 +65473,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - StackInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + StackInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2074,7 +2074,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.880"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.881"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -4897,6 +4897,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCannotReturn << 2)); GIV(argumentCount) = 1; goto normalSend; + /* return self */ goto l282; } if (unwindContextOrNilOrZero != 0) { @@ -4919,6 +4920,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorAboutToReturn << 2)); GIV(argumentCount) = 2; goto normalSend; + /* return self */ goto l282; } contextToReturnTo = null; @@ -5003,6 +5005,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCannotReturn << 2)); GIV(argumentCount) = 1; goto normalSend; + /* return self */ goto l282; } } @@ -56349,7 +56352,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -56566,7 +56569,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -56591,7 +56594,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((index - 1) < ((frameNumArgs = byteAt((spouseFP + FoxFrameFlags) + 1))) @@ -56649,7 +56652,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -56895,7 +56898,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -56951,7 +56954,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((index - 1) < ((frameNumArgs = byteAt((spouseFP + FoxFrameFlags) + 1)))) { Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - StackInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + StackInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2071,7 +2071,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.880"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.881"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -4888,6 +4888,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCannotReturn << 2)); GIV(argumentCount) = 1; goto normalSend; + /* return self */ goto l282; } if (unwindContextOrNilOrZero != 0) { @@ -4910,6 +4911,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorAboutToReturn << 2)); GIV(argumentCount) = 2; goto normalSend; + /* return self */ goto l282; } contextToReturnTo = null; @@ -4994,6 +4996,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCannotReturn << 2)); GIV(argumentCount) = 1; goto normalSend; + /* return self */ goto l282; } } @@ -56340,7 +56343,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -56557,7 +56560,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -56582,7 +56585,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((index - 1) < ((frameNumArgs = byteAt((spouseFP + FoxFrameFlags) + 1))) @@ -56640,7 +56643,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -56886,7 +56889,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -56942,7 +56945,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((index - 1) < ((frameNumArgs = byteAt((spouseFP + FoxFrameFlags) + 1)))) { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Sep 13 16:20:19 PDT 2014 + Sat Sep 13 17:02:19 PDT 2014 Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -851,7 +851,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2083,7 +2083,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.880]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.881]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36763,17 +36763,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36784,21 +36782,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36813,7 +36797,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36867,18 +36851,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38750,7 +38734,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -52580,7 +52564,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -52745,7 +52729,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -52770,7 +52754,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -52831,7 +52815,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = longAt(aContext); @@ -53015,7 +52999,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -53061,7 +53045,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { @@ -54272,7 +54256,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -854,7 +854,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2086,7 +2086,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.880]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.881]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36772,17 +36772,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36793,21 +36791,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36822,7 +36806,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36876,18 +36860,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38759,7 +38743,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -52589,7 +52573,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -52754,7 +52738,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -52779,7 +52763,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -52840,7 +52824,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = longAt(aContext); @@ -53024,7 +53008,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -53070,7 +53054,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { @@ -54281,7 +54265,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1132,7 +1132,7 @@ sqInt removeGCRoot(sqInt *varLoc); static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2323,7 +2323,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.880]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.881]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -21315,6 +21315,7 @@ target = intOrSelector; } printStringOf(target); + /* return self */ } } } @@ -51864,7 +51865,7 @@ zero if no change was possible. */ -static sqInt +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -64909,7 +64910,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -65155,7 +65156,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -65211,7 +65212,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1135,7 +1135,7 @@ sqInt removeGCRoot(sqInt *varLoc); static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms; static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms; -static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); @@ -2326,7 +2326,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.880]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.881]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -21324,6 +21324,7 @@ target = intOrSelector; } printStringOf(target); + /* return self */ } } } @@ -51873,7 +51874,7 @@ zero if no change was possible. */ -static sqInt +static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -64918,7 +64919,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -65164,7 +65165,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -65220,7 +65221,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/spursrc/vm/cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2314,7 +2314,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.880]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.881]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16422,6 +16422,7 @@ target = intOrSelector; } printStringOf(target); + /* return self */ } } } Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/spursrc/vm/cointerp.h 2014-09-14 00:02:53 UTC (rev 3079) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2317,7 +2317,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.880]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.881]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16431,6 +16431,7 @@ target = intOrSelector; } printStringOf(target); + /* return self */ } } } Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-09-13 23:20:54 UTC (rev 3078) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-09-14 00:02:53 UTC (rev 3079) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 from - StackInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + StackInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2066,7 +2066,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.880]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.881]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -4791,6 +4791,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCannotReturn << 2)); GIV(argumentCount) = 1; goto normalSend; + /* return self */ goto l140; } if (unwindContextOrNilOrZero != 0) { @@ -4813,6 +4814,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorAboutToReturn << 2)); GIV(argumentCount) = 2; goto normalSend; + /* return self */ goto l140; } contextToReturnTo = null; @@ -4897,6 +4899,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCannotReturn << 2)); GIV(argumentCount) = 1; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.881.mcz
by commits＠source.squeak.org 14 Sep '14

14 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.881.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.881 Author: eem Time: 13 September 2014, 4:51:25.863 pm UUID: 539d444b-dd24-4254-a007-bd1e298e84f7 Ancestors: VMMaker.oscog-eem.880 Fix some conflicting return types. Add debug hook to inferReturnTypeFromReturnsIn: to do so. =============== Diff against VMMaker.oscog-eem.880 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveFullGC (in category 'memory space primitives') ----- primitiveFullGC "Do a full garbage collection. In SqueakV3ObjectMemory, answer the number of bytes available (including swap space if dynamic memory management is supported). In Spur, answer the size of the largest free chunk." objectMemory hasSpurMemoryManagerAPI ifTrue: [self pop: 1 thenPushInteger: objectMemory fullGC. ^self]. objectMemory fullGCLock > 0 ifTrue: + [self primitiveFailFor: PrimErrInappropriate. + ^self]. - [^self primitiveFailFor: PrimErrInappropriate]. objectMemory incrementalGC. "maximimize space for forwarding table" objectMemory fullGC. self pop: 1 thenPushInteger: (objectMemory bytesLeft: true)! Item was changed: ----- Method: StackInterpreter>>commonReturn (in category 'return bytecodes') ----- commonReturn "Do an ^-return (return form method), perhaps checking for unwinds if this is a block activation. Note: Assumed to be inlined into the dispatch loop." <sharedCodeInCase: #returnReceiver> | closure home unwindContextOrNilOrZero frameToReturnTo contextToReturnTo theFP callerFP newPage | <var: #frameToReturnTo type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #newPage type: #'StackPage *'> <var: #thePage type: #'StackPage *'> "If this is a method simply return to the sender/caller." (self frameIsBlockActivation: localFP) ifFalse: [^self commonCallerReturn]. "Since this is a block activation the closure is on the stack above any args and the frame." closure := self pushedReceiverOrClosureOfFrame: localFP. home := nil. "Walk the closure's lexical chain to find the context or frame to return from (home)." [closure ~= objectMemory nilObject] whileTrue: [home := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: closure. closure := objectMemory fetchPointer: ClosureIndex ofObject: home]. "home is to be returned from provided there is no unwind-protect activation between this frame and home's sender. Search for an unwind. findUnwindThroughContext: will answer either the context for an unwind-protect activation or nilObj if the sender cannot be found or 0 if no unwind is found but the sender is. We must update the current page's headFrame pointers to enable the search to identify widowed contexts correctly." self writeBackHeadFramePointers. unwindContextOrNilOrZero := self internalFindUnwindThroughContext: home. unwindContextOrNilOrZero = objectMemory nilObject ifTrue: ["error: can't find home on chain; cannot return" ^self internalCannotReturn: localReturnValue]. unwindContextOrNilOrZero ~= 0 ifTrue: [^self internalAboutToReturn: localReturnValue through: unwindContextOrNilOrZero]. "Now we know home is on the sender chain. We could be returning to either a context or a frame. Find out which." contextToReturnTo := nil. (self isMarriedOrWidowedContext: home) ifTrue: [self assert: (self checkIsStillMarriedContext: home currentFP: localFP). theFP := self frameOfMarriedContext: home. (self isBaseFrame: theFP) ifTrue: [contextToReturnTo := self frameCallerContext: theFP] ifFalse: [frameToReturnTo := self frameCallerFP: theFP]] ifFalse: [contextToReturnTo := objectMemory fetchPointer: SenderIndex ofObject: home. ((objectMemory isContext: contextToReturnTo) and: [self isMarriedOrWidowedContext: contextToReturnTo]) ifTrue: [self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). frameToReturnTo := self frameOfMarriedContext: contextToReturnTo. contextToReturnTo := nil]]. "If returning to a context we must make a frame for it unless it is dead." contextToReturnTo ~= nil ifTrue: [frameToReturnTo := self establishFrameForContextToReturnTo: contextToReturnTo. frameToReturnTo == 0 ifTrue: ["error: home's sender is dead; cannot return" ^self internalCannotReturn: localReturnValue]]. "Now we have a frame to return to. If it is on a different page we must free intervening pages and nil out intervening contexts. We must free intervening stack pages because if we leave the pages to be divorced then their contexts will be divorced with intact senders and instruction pointers. This code is similar to primitiveTerminateTo. We must move any frames on itervening pages above the frame linked to because these may be in use, e.g. via co-routining (see baseFrameReturn)." self assert: stackPages pageListIsWellFormed. newPage := stackPages stackPageFor: frameToReturnTo. newPage ~~ stackPage ifTrue: [| currentCtx thePage nextCntx | currentCtx := self frameCallerContext: stackPage baseFP. self assert: (objectMemory isContext: currentCtx). stackPages freeStackPage: stackPage. [self assert: (objectMemory isContext: currentCtx). (self isMarriedOrWidowedContext: currentCtx) and: [(stackPages stackPageFor: (theFP := self frameOfMarriedContext: currentCtx)) = newPage]] whileFalse: [(self isMarriedOrWidowedContext: currentCtx) ifTrue: [thePage := stackPages stackPageFor: theFP. theFP ~= thePage headFP ifTrue: ["Since we've just deallocated a page we know that newStackPage won't deallocate an existing one." self moveFramesIn: thePage through: (self findFrameAbove: theFP inPage: thePage) toPage: self newStackPage]. currentCtx := self frameCallerContext: thePage baseFP. stackPages freeStackPage: thePage] ifFalse: [nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx. self markContextAsDead: currentCtx. currentCtx := nextCntx]]. self setStackPageAndLimit: newPage. localSP := stackPage headSP. localFP := stackPage headFP]. "Two cases. Returning to the top frame on a new page or an interior frame on the current page. The top frame has its instruction pointer on top of stack. An interior frame has its instruction pointer in the caller frame. We need to peel back any frames on the page until we get to the correct frame." localFP = frameToReturnTo ifTrue: "pop the saved IP, push the return value and continue." [localIP := self pointerForOop: self internalStackTop] ifFalse: [[callerFP := localFP. localFP := self frameCallerFP: localFP. localFP ~~ frameToReturnTo] whileTrue. localIP := self frameCallerSavedIP: callerFP. localSP := (self frameCallerSP: callerFP) - BytesPerWord]. self setMethod: (self frameMethod: localFP). self fetchNextBytecode. + self internalStackTopPut: localReturnValue! - ^self internalStackTopPut: localReturnValue! Item was changed: ----- Method: StackInterpreter>>printStringOf: (in category 'debug printing') ----- printStringOf: oop | fmt len cnt max i | <inline: false> (objectMemory isImmediate: oop) ifTrue: + [^self]. - [^nil]. (objectMemory addressCouldBeObj: oop) ifFalse: + [^self]. - [^nil]. fmt := objectMemory formatOf: oop. + fmt < objectMemory firstByteFormat ifTrue: [^self]. - fmt < objectMemory firstByteFormat ifTrue: [^nil]. cnt := (max := 128) min: (len := objectMemory lengthOf: oop). i := 0. ((objectMemory is: oop instanceOf: (objectMemory splObj: ClassByteArray) compactClassIndex: classByteArrayCompactIndex) or: [(self isInstanceOfClassLargePositiveInteger: oop) or: [(self isInstanceOfClassLargeNegativeInteger: oop)]]) ifTrue: [[i < cnt] whileTrue: [self printHex: (objectMemory fetchByte: i ofObject: oop). i := i + 1]] ifFalse: [[i < cnt] whileTrue: [self cCode: [(objectMemory fetchByte: i ofObject: oop) = 13 "Character cr asInteger" ifTrue: [self print: '<CR>'. i + 1 < len ifTrue: [self print: '...']. ^self]]. self printChar: (objectMemory fetchByte: i ofObject: oop). i := i + 1]]. len > max ifTrue: [self print: '...']. self flush! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveContextAt (in category 'indexing primitives') ----- primitiveContextAt "Special version of primitiveAt for accessing contexts. Written to be varargs for use from mirror primitives." | index value aContext spouseFP hdr fmt totalLength fixedFields stSize | <inline: false> <var: #spouseFP type: #'char *'> index := self stackTop. (objectMemory isIntegerObject: index) ifFalse: + [self primitiveFailFor: PrimErrBadArgument. + ^self]. - [^self primitiveFailFor: PrimErrBadArgument]. index := objectMemory integerValueOf: index. aContext := self stackValue: 1. "Duplicating much of stObject:at:put: here allows stObject:at:put: to omit tests for contexts." hdr := objectMemory baseHeader: aContext. (objectMemory isContextHeader: hdr) ifFalse: "might be an instance of a subclass" [value := self stObject: aContext at: index. self successful ifTrue: [self pop: argumentCount + 1 thenPush: value]. ^self]. self externalWriteBackHeadFramePointers. (self isStillMarriedContext: aContext) ifFalse: [fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: aContext baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: aContext format: fmt length: totalLength. stSize := self fetchStackPointerOf: aContext. (index between: 1 and: stSize) ifFalse: + [self primitiveFailFor: PrimErrBadIndex. + ^self]. - [^self primitiveFailFor: PrimErrBadIndex]. value := self subscript: aContext with: (index + fixedFields) format: fmt. self pop: argumentCount + 1 thenPush: value. ^self]. spouseFP := self frameOfMarriedContext: aContext. (index between: 1 and: (self stackPointerIndexForFrame: spouseFP)) ifFalse: + [self primitiveFailFor: PrimErrBadIndex. + ^self]. - [^self primitiveFailFor: PrimErrBadIndex]. value := self temporary: index - 1 in: spouseFP. self pop: argumentCount + 1 thenPush: value! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveContextAtPut (in category 'indexing primitives') ----- primitiveContextAtPut "Special version of primitiveAtPut for accessing contexts. Written to be varargs for use from mirror primitives." | index value aContext spouseFP hdr fmt totalLength fixedFields stSize | <inline: false> <var: #spouseFP type: #'char *'> value := self stackTop. index := self stackValue: 1. aContext := self stackValue: 2. (objectMemory isIntegerObject: index) ifFalse: + [self primitiveFailFor: PrimErrBadArgument. + ^self]. - [^self primitiveFailFor: PrimErrBadArgument]. "Duplicating much of stObject:at:put: here allows stObject:at:put: to omit tests for contexts." hdr := objectMemory baseHeader: aContext. index := objectMemory integerValueOf: index. (objectMemory isContextHeader: hdr) ifFalse: "might be an instance of a subclass" [self stObject: aContext at: index put: value. self successful ifTrue: [self pop: argumentCount + 1 thenPush: value]. ^self]. self externalWriteBackHeadFramePointers. (self isStillMarriedContext: aContext) ifFalse: [fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: aContext baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: aContext format: fmt length: totalLength. stSize := self fetchStackPointerOf: aContext. (index between: 1 and: stSize) ifFalse: + [self primitiveFailFor: PrimErrBadIndex. + ^self]. - [^self primitiveFailFor: PrimErrBadIndex]. self subscript: aContext with: (index + fixedFields) storing: value format: fmt. self pop: argumentCount + 1 thenPush: value. ^self]. spouseFP := self frameOfMarriedContext: aContext. (index between: 1 and: (self stackPointerIndexForFrame: spouseFP)) ifFalse: + [self primitiveFailFor: PrimErrBadIndex. + ^self]. - [^self primitiveFailFor: PrimErrBadIndex]. self temporary: index - 1 in: spouseFP put: value. self pop: argumentCount + 1 thenPush: value! Item was changed: ----- Method: TMethod>>inferReturnTypeFromReturnsIn: (in category 'type inference') ----- inferReturnTypeFromReturnsIn: aCodeGen "Attempt to infer the return type of the receiver from returns in the parse tree." "this for determining which returns have which return types:" "aCodeGen pushScope: declarations while: [parseTree nodesSelect: [:n| n isReturn] thenCollect: [:n| | s | s := Set new. self addTypesFor: n expression to: s in: aCodeGen. {n. s}]]" returnType ifNil: "the initial default" [aCodeGen pushScope: declarations while: [| hasReturn returnTypes | hasReturn := false. returnTypes := Set new. + "Debug: + (| rettypes | + rettypes := Dictionary new. + parseTree nodesDo: + [:node| + node isReturn ifTrue: + [| types | + self addTypesFor: node expression to: (types := Set new) in: aCodeGen. + rettypes at: node expression put: types]]. + rettypes)" parseTree nodesDo: [:node| node isReturn ifTrue: [hasReturn := true. self addTypesFor: node expression to: returnTypes in: aCodeGen]]. returnTypes remove: #implicit ifAbsent: []. returnTypes := aCodeGen harmonizeReturnTypesIn: returnTypes. hasReturn ifTrue: [returnTypes size > 1 ifTrue: + [| message | + message := String streamContents: + [:s| + s nextPutAll: 'conflicting return types '. + returnTypes + do: [:t| s nextPutAll: t] + separatedBy: [s nextPutAll: ', ']. + s nextPutAll: ' in '; nextPutAll: selector; cr]. + Notification signal: message. + aCodeGen logger show: message]. - [aCodeGen logger show: - (String streamContents: - [:s| - s nextPutAll: 'conflicting return types '. - returnTypes - do: [:t| s nextPutAll: t] - separatedBy: [s nextPutAll: ', ']. - s nextPutAll: ' in '; nextPutAll: selector; cr])]. returnTypes size = 1 ifTrue: [self returnType: returnTypes anyOne]] ifFalse: [self returnType: (aCodeGen implicitReturnTypeFor: selector)]]]!

1 0

[commit][3078] CogVM source as per VMMaker.oscog-eem.880
by commits＠squeakvm.org 14 Sep '14

14 Sep '14

Revision: 3078 Author: eliot Date: 2014-09-13 16:20:54 -0700 (Sat, 13 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.880 Move evaluation of Cogit primitive desacriptor enabled function from initialization to just-in-time, and add enablers on SmallInteger primitives to ensure they are applied only to SmallInteger receivers (falling back to interpreter prims if not). Hence fix Cog for 4.1 (e.g. MuO) images. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-09-13 23:20:54 UTC (rev 3078) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGenerator VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 from - StackToRegisterMappingCogit VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + StackToRegisterMappingCogit VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -601,7 +601,6 @@ static sqInt checkIfValidOopRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) NoDbgRegParms; sqInt checkIntegrityOfObjectReferencesInCode(sqInt fullGCFlag); static sqInt checkMaybeObjRefAt(sqInt mcpc) NoDbgRegParms; -static void checkPrimitiveTableEnablers(void); static sqInt checkValidObjectReferencesInClosedPIC(CogMethod *cPIC) NoDbgRegParms; static sqInt closedPICRefersToUnmarkedObject(CogMethod *cPIC) NoDbgRegParms; char * codeEntryFor(char *address); @@ -732,6 +731,7 @@ static sqInt maybeGenerateCheckFeatures(void); static sqInt maybeGenerateICacheFlush(void); static void maybeMarkCountersIn(CogMethod *cogMethod) NoDbgRegParms; +static sqInt mclassIsSmallInteger(sqInt ignoredPrimIndex) NoDbgRegParms; usqInt mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *cogMethod); static sqInt methodhasSameCodeAscheckPenultimate(sqInt methodA, sqInt methodB, sqInt comparePenultimateLiteral) NoDbgRegParms; sqInt minCogMethodAddress(void); @@ -750,8 +750,10 @@ static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); +static sqInt processorHasDivQuoRemAndMClassIsSmallInteger(sqInt ignoredPrimIndex) NoDbgRegParms; static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex) NoDbgRegParms; static sqInt processorHasDoublePrecisionFloatingPointSupport(sqInt ignoredPrimIndex) NoDbgRegParms; +static sqInt processorHasMultiplyAndMClassIsSmallInteger(sqInt ignoredPrimIndex) NoDbgRegParms; static sqInt processorHasMultiply(sqInt ignoredPrimIndex) NoDbgRegParms; static AbstractInstruction * gRetN(sqInt offset) NoDbgRegParms; static void recordGeneratedRunTimeaddress(char *aString, sqInt address) NoDbgRegParms; @@ -1796,231 +1798,6 @@ static void (*postCompileHook)(CogMethod *, void *); static BytecodeDescriptor * prevBCDescriptor; static AbstractInstruction * primInvokeLabel; -static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1] = { - { 0, -1, 0 }, - { genPrimitiveAdd, 1, 0 }, - { genPrimitiveSubtract, 1, 0 }, - { genPrimitiveLessThan, 1, 0 }, - { genPrimitiveGreaterThan, 1, 0 }, - { genPrimitiveLessOrEqual, 1, 0 }, - { genPrimitiveGreaterOrEqual, 1, 0 }, - { genPrimitiveEqual, 1, 0 }, - { genPrimitiveNotEqual, 1, 0 }, - { genPrimitiveMultiply, 1, processorHasMultiply }, - { genPrimitiveDivide, 1, processorHasDivQuoRem }, - { genPrimitiveMod, 1, processorHasDivQuoRem }, - { genPrimitiveDiv, 1, processorHasDivQuoRem }, - { genPrimitiveQuo, 1, processorHasDivQuoRem }, - { genPrimitiveBitAnd, 1, 0 }, - { genPrimitiveBitOr, 1, 0 }, - { genPrimitiveBitXor, 1, 0 }, - { genPrimitiveBitShift, 1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveAsFloat, 0, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatAdd, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatSubtract, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatLessThan, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatGreaterThan, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatLessOrEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatGreaterOrEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatNotEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatMultiply, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatDivide, 1, processorHasDoublePrecisionFloatingPointSupport }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveFloatSquareRoot, 0, processorHasDoublePrecisionFloatingPointSupport }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveAt, 1, 0 }, - { genPrimitiveAtPut, 2, 0 }, - { genPrimitiveSize, 0, 0 }, - { genPrimitiveStringAt, 1, 0 }, - { genPrimitiveStringAtPut, 2, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveNew, -1, 0 }, - { genPrimitiveNewWithArg, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveIdentityHash, 0, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveNewMethod, 2, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveIdentical, 1, 0 }, - { genPrimitiveClass, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveNotIdentical, 1, 0 }, - { genPrimitiveAsCharacter, -1, 0 }, - { genPrimitiveCharacterValue, 0, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveIdentityHash, 0, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genFastPrimFail, -1, 0 }, - { genFastPrimFail, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveClosureValue, 0, 0 }, - { genPrimitiveClosureValue, 1, 0 }, - { genPrimitiveClosureValue, 2, 0 }, - { genPrimitiveClosureValue, 3, 0 }, - { genPrimitiveClosureValue, 4, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveClosureValue, 0, 0 }, - { genPrimitiveClosureValue, 1, 0 } -}; static sqInt primitiveIndex; void (*realCECallCogCodePopReceiverAndClassRegs)(void); void (*realCECallCogCodePopReceiverArg0Regs)(void); @@ -9358,25 +9135,6 @@ return checkValidObjectReference(maybeObject); } - -/* Disable primitive generators with enablers that answer false. */ - -static void -checkPrimitiveTableEnablers(void) -{ - sqInt i; - PrimitiveDescriptor *primitiveDescriptor; - - for (i = 1; i <= MaxCompiledPrimitiveIndex; i += 1) { - primitiveDescriptor = (&(primitiveGeneratorTable[i])); - if (((primitiveDescriptor->enabled)) != null) { - if (!(((primitiveDescriptor->enabled))(i))) { - (primitiveDescriptor->primitiveGenerator = null); - } - } - } -} - static sqInt checkValidObjectReferencesInClosedPIC(CogMethod *cPIC) { @@ -10321,18 +10079,12 @@ return 0; } if ((((primitiveDescriptor = primitiveGeneratorOrNil())) != null) - && (((primitiveDescriptor->primitiveGenerator)) != null)) { - - /* If a descriptor specifies an argument count (by numArgs >= 0) - then it must match for the generated code to be correct. For - example for speed many primitives use ResultReceiverReg - instead of accessing the stack, so the receiver better be at - numArgs down the stack. Use the interpreter version if not. */ - - if ((((primitiveDescriptor->primNumArgs)) < 0) - || (((primitiveDescriptor->primNumArgs)) == (argumentCountOf(methodObj)))) { - return ((primitiveDescriptor->primitiveGenerator))(); - } + && ((((primitiveDescriptor->primitiveGenerator)) != null) + && (((((primitiveDescriptor->primNumArgs)) < 0) + || (((primitiveDescriptor->primNumArgs)) == (argumentCountOf(methodObj)))) + && ((((primitiveDescriptor->enabled)) == null) + || (((primitiveDescriptor->enabled))(primitiveIndex)))))) { + return ((primitiveDescriptor->primitiveGenerator))(); } if ((((primitiveRoutine = functionPointerForCompiledMethodprimitiveIndex(methodObj, primitiveIndex))) == null) || (primitiveRoutine == (functionPointerForinClass(0, null)))) { @@ -11835,7 +11587,6 @@ generateStackPointerCapture(); generateTrampolines(); - checkPrimitiveTableEnablers(); manageFromto(methodZoneBase, endAddress); computeEntryOffsets(); generateClosedPICPrototype(); @@ -13111,7 +12862,13 @@ { } +static sqInt +mclassIsSmallInteger(sqInt ignoredPrimIndex) +{ + return (methodClassOf(methodObj)) == (classSmallInteger()); +} + /* Answer the absolute machine code pc matching the zero-relative bytecode pc of a backward branch in cogMethod, given the start of the bytecodes for cogMethod's block or method object. */ @@ -13514,6 +13271,231 @@ primitiveGeneratorOrNil(void) { PrimitiveDescriptor *primitiveDescriptor; + static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1] = { + { 0, -1, 0 }, + { genPrimitiveAdd, 1, mclassIsSmallInteger }, + { genPrimitiveSubtract, 1, mclassIsSmallInteger }, + { genPrimitiveLessThan, 1, mclassIsSmallInteger }, + { genPrimitiveGreaterThan, 1, mclassIsSmallInteger }, + { genPrimitiveLessOrEqual, 1, mclassIsSmallInteger }, + { genPrimitiveGreaterOrEqual, 1, mclassIsSmallInteger }, + { genPrimitiveEqual, 1, mclassIsSmallInteger }, + { genPrimitiveNotEqual, 1, mclassIsSmallInteger }, + { genPrimitiveMultiply, 1, processorHasMultiplyAndMClassIsSmallInteger }, + { genPrimitiveDivide, 1, processorHasDivQuoRemAndMClassIsSmallInteger }, + { genPrimitiveMod, 1, processorHasDivQuoRemAndMClassIsSmallInteger }, + { genPrimitiveDiv, 1, processorHasDivQuoRemAndMClassIsSmallInteger }, + { genPrimitiveQuo, 1, processorHasDivQuoRemAndMClassIsSmallInteger }, + { genPrimitiveBitAnd, 1, mclassIsSmallInteger }, + { genPrimitiveBitOr, 1, mclassIsSmallInteger }, + { genPrimitiveBitXor, 1, mclassIsSmallInteger }, + { genPrimitiveBitShift, 1, mclassIsSmallInteger }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveAsFloat, 0, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatAdd, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatSubtract, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatLessThan, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatGreaterThan, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatLessOrEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatGreaterOrEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatNotEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatMultiply, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatDivide, 1, processorHasDoublePrecisionFloatingPointSupport }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveFloatSquareRoot, 0, processorHasDoublePrecisionFloatingPointSupport }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveAt, 1, 0 }, + { genPrimitiveAtPut, 2, 0 }, + { genPrimitiveSize, 0, 0 }, + { genPrimitiveStringAt, 1, 0 }, + { genPrimitiveStringAtPut, 2, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveNew, -1, 0 }, + { genPrimitiveNewWithArg, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveIdentityHash, 0, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveNewMethod, 2, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveIdentical, 1, 0 }, + { genPrimitiveClass, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveNotIdentical, 1, 0 }, + { genPrimitiveAsCharacter, -1, 0 }, + { genPrimitiveCharacterValue, 0, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveIdentityHash, 0, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genFastPrimFail, -1, 0 }, + { genFastPrimFail, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveClosureValue, 0, 0 }, + { genPrimitiveClosureValue, 1, 0 }, + { genPrimitiveClosureValue, 2, 0 }, + { genPrimitiveClosureValue, 3, 0 }, + { genPrimitiveClosureValue, 4, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveClosureValue, 0, 0 }, + { genPrimitiveClosureValue, 1, 0 } +}; if (isQuickPrimitiveIndex(primitiveIndex)) { @@ -13558,6 +13540,13 @@ } static sqInt +processorHasDivQuoRemAndMClassIsSmallInteger(sqInt ignoredPrimIndex) +{ + return (processorHasDivQuoRem(ignoredPrimIndex)) + && (mclassIsSmallInteger(ignoredPrimIndex)); +} + +static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex) { return canDivQuoRem(backEnd); @@ -13570,6 +13559,13 @@ } static sqInt +processorHasMultiplyAndMClassIsSmallInteger(sqInt ignoredPrimIndex) +{ + return (processorHasMultiply(ignoredPrimIndex)) + && (mclassIsSmallInteger(ignoredPrimIndex)); +} + +static sqInt processorHasMultiply(sqInt ignoredPrimIndex) { return canMulRR(backEnd); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-09-13 23:20:54 UTC (rev 3078) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGenerator VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 from - CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2086,7 +2086,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.879"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.880"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -52659,7 +52659,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -52824,7 +52824,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -52849,7 +52849,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -52910,7 +52910,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = longAt(aContext); @@ -53094,7 +53094,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -53140,7 +53140,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { @@ -54351,7 +54351,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-09-13 23:20:54 UTC (rev 3078) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 from - CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2089,7 +2089,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.879"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.880"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -52668,7 +52668,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -52833,7 +52833,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -52858,7 +52858,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -52919,7 +52919,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = longAt(aContext); @@ -53103,7 +53103,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -53149,7 +53149,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { @@ -54360,7 +54360,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-09-13 23:20:54 UTC (rev 3078) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGenerator VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 from - StackToRegisterMappingCogit VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + StackToRegisterMappingCogit VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -597,7 +597,6 @@ static sqInt checkIfValidOopRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) NoDbgRegParms; sqInt checkIntegrityOfObjectReferencesInCode(sqInt fullGCFlag); static sqInt checkMaybeObjRefAt(sqInt mcpc) NoDbgRegParms; -static void checkPrimitiveTableEnablers(void); static sqInt checkValidObjectReferencesInClosedPIC(CogMethod *cPIC) NoDbgRegParms; char * codeEntryFor(char *address); char * codeEntryNameFor(char *address); @@ -730,6 +729,7 @@ static sqInt maybeGenerateCheckFeatures(void); static sqInt maybeGenerateICacheFlush(void); static void maybeMarkCountersIn(CogMethod *cogMethod) NoDbgRegParms; +static sqInt mclassIsSmallInteger(sqInt ignoredPrimIndex) NoDbgRegParms; usqInt mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *cogMethod); static sqInt methodhasSameCodeAscheckPenultimate(sqInt methodA, sqInt methodB, sqInt comparePenultimateLiteral) NoDbgRegParms; sqInt minCogMethodAddress(void); @@ -749,8 +749,10 @@ static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); void printTrampolineTable(void); +static sqInt processorHasDivQuoRemAndMClassIsSmallInteger(sqInt ignoredPrimIndex) NoDbgRegParms; static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex) NoDbgRegParms; static sqInt processorHasDoublePrecisionFloatingPointSupport(sqInt ignoredPrimIndex) NoDbgRegParms; +static sqInt processorHasMultiplyAndMClassIsSmallInteger(sqInt ignoredPrimIndex) NoDbgRegParms; static sqInt processorHasMultiply(sqInt ignoredPrimIndex) NoDbgRegParms; static AbstractInstruction * gRetN(sqInt offset) NoDbgRegParms; static void recordGeneratedRunTimeaddress(char *aString, sqInt address) NoDbgRegParms; @@ -1811,231 +1813,6 @@ static void (*postCompileHook)(CogMethod *, void *); static BytecodeDescriptor * prevBCDescriptor; static AbstractInstruction * primInvokeLabel; -static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1] = { - { 0, -1, 0 }, - { genPrimitiveAdd, 1, 0 }, - { genPrimitiveSubtract, 1, 0 }, - { genPrimitiveLessThan, 1, 0 }, - { genPrimitiveGreaterThan, 1, 0 }, - { genPrimitiveLessOrEqual, 1, 0 }, - { genPrimitiveGreaterOrEqual, 1, 0 }, - { genPrimitiveEqual, 1, 0 }, - { genPrimitiveNotEqual, 1, 0 }, - { genPrimitiveMultiply, 1, processorHasMultiply }, - { genPrimitiveDivide, 1, processorHasDivQuoRem }, - { genPrimitiveMod, 1, processorHasDivQuoRem }, - { genPrimitiveDiv, 1, processorHasDivQuoRem }, - { genPrimitiveQuo, 1, processorHasDivQuoRem }, - { genPrimitiveBitAnd, 1, 0 }, - { genPrimitiveBitOr, 1, 0 }, - { genPrimitiveBitXor, 1, 0 }, - { genPrimitiveBitShift, 1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveAsFloat, 0, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatAdd, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatSubtract, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatLessThan, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatGreaterThan, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatLessOrEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatGreaterOrEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatNotEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatMultiply, 1, processorHasDoublePrecisionFloatingPointSupport }, - { genPrimitiveFloatDivide, 1, processorHasDoublePrecisionFloatingPointSupport }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveFloatSquareRoot, 0, processorHasDoublePrecisionFloatingPointSupport }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveAt, 1, 0 }, - { genPrimitiveAtPut, 2, 0 }, - { genPrimitiveSize, 0, 0 }, - { genPrimitiveStringAt, 1, 0 }, - { genPrimitiveStringAtPut, 2, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveNew, -1, 0 }, - { genPrimitiveNewWithArg, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveIdentityHash, 0, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveNewMethod, 2, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveIdentical, 1, 0 }, - { genPrimitiveClass, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveNotIdentical, 1, 0 }, - { genPrimitiveAsCharacter, -1, 0 }, - { genPrimitiveCharacterValue, 0, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveIdentityHash, 0, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genFastPrimFail, -1, 0 }, - { genFastPrimFail, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveClosureValue, 0, 0 }, - { genPrimitiveClosureValue, 1, 0 }, - { genPrimitiveClosureValue, 2, 0 }, - { genPrimitiveClosureValue, 3, 0 }, - { genPrimitiveClosureValue, 4, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveClosureValue, 0, 0 }, - { genPrimitiveClosureValue, 1, 0 } -}; static sqInt primitiveIndex; void (*realCECallCogCodePopReceiverAndClassRegs)(void); void (*realCECallCogCodePopReceiverArg0Regs)(void); @@ -9375,25 +9152,6 @@ return checkValidObjectReference(maybeObject); } - -/* Disable primitive generators with enablers that answer false. */ - -static void -checkPrimitiveTableEnablers(void) -{ - sqInt i; - PrimitiveDescriptor *primitiveDescriptor; - - for (i = 1; i <= MaxCompiledPrimitiveIndex; i += 1) { - primitiveDescriptor = (&(primitiveGeneratorTable[i])); - if (((primitiveDescriptor->enabled)) != null) { - if (!(((primitiveDescriptor->enabled))(i))) { - (primitiveDescriptor->primitiveGenerator = null); - } - } - } -} - static sqInt checkValidObjectReferencesInClosedPIC(CogMethod *cPIC) { @@ -10275,18 +10033,12 @@ return 0; } if ((((primitiveDescriptor = primitiveGeneratorOrNil())) != null) - && (((primitiveDescriptor->primitiveGenerator)) != null)) { - - /* If a descriptor specifies an argument count (by numArgs >= 0) - then it must match for the generated code to be correct. For - example for speed many primitives use ResultReceiverReg - instead of accessing the stack, so the receiver better be at - numArgs down the stack. Use the interpreter version if not. */ - - if ((((primitiveDescriptor->primNumArgs)) < 0) - || (((primitiveDescriptor->primNumArgs)) == (argumentCountOf(methodObj)))) { - return ((primitiveDescriptor->primitiveGenerator))(); - } + && ((((primitiveDescriptor->primitiveGenerator)) != null) + && (((((primitiveDescriptor->primNumArgs)) < 0) + || (((primitiveDescriptor->primNumArgs)) == (argumentCountOf(methodObj)))) + && ((((primitiveDescriptor->enabled)) == null) + || (((primitiveDescriptor->enabled))(primitiveIndex)))))) { + return ((primitiveDescriptor->primitiveGenerator))(); } if ((((primitiveRoutine = functionPointerForCompiledMethodprimitiveIndex(methodObj, primitiveIndex))) == null) || (primitiveRoutine == (functionPointerForinClass(0, null)))) { @@ -11942,7 +11694,6 @@ generateStackPointerCapture(); generateTrampolines(); - checkPrimitiveTableEnablers(); manageFromto(methodZoneBase, endAddress); computeEntryOffsets(); generateClosedPICPrototype(); @@ -13010,7 +12761,13 @@ { } +static sqInt +mclassIsSmallInteger(sqInt ignoredPrimIndex) +{ + return (methodClassOf(methodObj)) == (classSmallInteger()); +} + /* Answer the absolute machine code pc matching the zero-relative bytecode pc of a backward branch in cogMethod, given the start of the bytecodes for cogMethod's block or method object. */ @@ -13419,6 +13176,231 @@ primitiveGeneratorOrNil(void) { PrimitiveDescriptor *primitiveDescriptor; + static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1] = { + { 0, -1, 0 }, + { genPrimitiveAdd, 1, mclassIsSmallInteger }, + { genPrimitiveSubtract, 1, mclassIsSmallInteger }, + { genPrimitiveLessThan, 1, mclassIsSmallInteger }, + { genPrimitiveGreaterThan, 1, mclassIsSmallInteger }, + { genPrimitiveLessOrEqual, 1, mclassIsSmallInteger }, + { genPrimitiveGreaterOrEqual, 1, mclassIsSmallInteger }, + { genPrimitiveEqual, 1, mclassIsSmallInteger }, + { genPrimitiveNotEqual, 1, mclassIsSmallInteger }, + { genPrimitiveMultiply, 1, processorHasMultiplyAndMClassIsSmallInteger }, + { genPrimitiveDivide, 1, processorHasDivQuoRemAndMClassIsSmallInteger }, + { genPrimitiveMod, 1, processorHasDivQuoRemAndMClassIsSmallInteger }, + { genPrimitiveDiv, 1, processorHasDivQuoRemAndMClassIsSmallInteger }, + { genPrimitiveQuo, 1, processorHasDivQuoRemAndMClassIsSmallInteger }, + { genPrimitiveBitAnd, 1, mclassIsSmallInteger }, + { genPrimitiveBitOr, 1, mclassIsSmallInteger }, + { genPrimitiveBitXor, 1, mclassIsSmallInteger }, + { genPrimitiveBitShift, 1, mclassIsSmallInteger }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveAsFloat, 0, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatAdd, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatSubtract, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatLessThan, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatGreaterThan, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatLessOrEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatGreaterOrEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatNotEqual, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatMultiply, 1, processorHasDoublePrecisionFloatingPointSupport }, + { genPrimitiveFloatDivide, 1, processorHasDoublePrecisionFloatingPointSupport }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveFloatSquareRoot, 0, processorHasDoublePrecisionFloatingPointSupport }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveAt, 1, 0 }, + { genPrimitiveAtPut, 2, 0 }, + { genPrimitiveSize, 0, 0 }, + { genPrimitiveStringAt, 1, 0 }, + { genPrimitiveStringAtPut, 2, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveNew, -1, 0 }, + { genPrimitiveNewWithArg, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveIdentityHash, 0, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveNewMethod, 2, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveIdentical, 1, 0 }, + { genPrimitiveClass, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveNotIdentical, 1, 0 }, + { genPrimitiveAsCharacter, -1, 0 }, + { genPrimitiveCharacterValue, 0, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveIdentityHash, 0, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genFastPrimFail, -1, 0 }, + { genFastPrimFail, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveClosureValue, 0, 0 }, + { genPrimitiveClosureValue, 1, 0 }, + { genPrimitiveClosureValue, 2, 0 }, + { genPrimitiveClosureValue, 3, 0 }, + { genPrimitiveClosureValue, 4, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { 0, -1, 0 }, + { genPrimitiveClosureValue, 0, 0 }, + { genPrimitiveClosureValue, 1, 0 } +}; if (isQuickPrimitiveIndex(primitiveIndex)) { @@ -13463,6 +13445,13 @@ } static sqInt +processorHasDivQuoRemAndMClassIsSmallInteger(sqInt ignoredPrimIndex) +{ + return (processorHasDivQuoRem(ignoredPrimIndex)) + && (mclassIsSmallInteger(ignoredPrimIndex)); +} + +static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex) { return canDivQuoRem(backEnd); @@ -13475,6 +13464,13 @@ } static sqInt +processorHasMultiplyAndMClassIsSmallInteger(sqInt ignoredPrimIndex) +{ + return (processorHasMultiply(ignoredPrimIndex)) + && (mclassIsSmallInteger(ignoredPrimIndex)); +} + +static sqInt processorHasMultiply(sqInt ignoredPrimIndex) { return canMulRR(backEnd); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-09-13 23:20:54 UTC (rev 3078) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.876 uuid: 85989927-97e3-4111-a351-b242bf444291 + CCodeGenerator VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 from - CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -798,6 +798,7 @@ sqInt ceClassAtIndex(sqInt classIndex); void ceSheduleScavenge(void); static void clearLeakMapAndMapAccessibleObjects(void); +static sqInt copyObjtoSegmentaddrstopAtsaveOopAt(sqInt objOop, sqInt segmentWordArray, sqInt limitSeg, sqInt stopAddr, sqInt oopPtr) NoDbgRegParms; void ensureNoForwardedLiteralsIn(sqInt aMethodObj); usqInt freeStartAddress(void); usqInt getScavengeThreshold(void); @@ -2324,7 +2325,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.879"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.880"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36632,18 +36633,27 @@ primitiveStoreImageSegment(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt arrayOfRoots; + sqInt copyObj; + sqInt copyPtr; sqInt ecode; sqInt endSeg; sqInt firstIn; sqInt firstOut; - sqInt hdrBaseIn; - sqInt hdrBaseOut; sqInt lastIn; sqInt lastOut; - sqInt lastSeg; + sqInt limitSeg; + sqInt newSegLimit; + sqInt numSlots; + usqInt numSlots1; + usqInt numSlots11; + usqInt numSlots2; + usqInt numSlots3; + sqInt originalObj; + sqInt originalPtr; sqInt outPointerArray; + usqInt p; sqInt segmentWordArray; - sqInt versionOffset; + sqInt slotBytes; outPointerArray = longAt(GIV(stackPointer)); segmentWordArray = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -38588,6 +38598,84 @@ } +/* Copy objOop into the segment beginning at limitSeg, and forward it to the + copy. Fail if out of space. Answer the next segmentAddr if successful. */ +/* Copy the object... */ + +static sqInt +copyObjtoSegmentaddrstopAtsaveOopAt(sqInt objOop, sqInt segmentWordArray, sqInt limitSeg, sqInt stopAddr, sqInt oopPtr) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + usqInt bodySize; + sqInt copy; + sqInt header; + usqInt numSlots; + sqInt valuePointer; + + bodySize = bytesInObject(objOop); + if ((((usqInt) (limitSeg + bodySize))) >= (((usqInt) stopAddr))) { + return 0; + } + memcpy(limitSeg, ((byteAt(objOop + 7)) == 0xFF + ? objOop - (BaseHeaderSize) + : objOop), bodySize); + /* begin objectStartingAt: */ + numSlots = byteAt(limitSeg + 7); + copy = (numSlots == 0xFF + ? limitSeg + (BaseHeaderSize) + : limitSeg); + /* begin setIsRememberedOf:to: */ + flag("endianness"); + longAtput(copy, (longAt(copy)) & (~(1 << 29))); + /* begin setIsPinnedOf:to: */ + flag("endianness"); + longAtput(copy, (longAt(copy)) & (~(1 << 30))); + setIsMarkedOfto(copy, 0); + if ((((((usqInt) (longAt(objOop))) >> 24) & 0x1F) >= 24) + && (methodHasCogMethod(objOop))) { + /* begin storePointerUnchecked:ofObject:withValue: */ + /* begin methodHeaderOf: */ + assert(isCompiledMethod(objOop)); + header = longAt((objOop + (BaseHeaderSize)) + (HeaderIndex << 2)); + valuePointer = ((header & 1) + ? header + : (assert((((usqInt)header)) < GIV(newSpaceStart)), + assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), + ((((CogMethod *) header))->methodHeader))); + assert(!(isForwarded(copy))); + longAtput((copy + (BaseHeaderSize)) + (HeaderIndex << 2), valuePointer); + } + longAtput(oopPtr, objOop); + /* begin forward:to: */ + /* begin set:classIndexTo:formatTo: */ + assert(((8 >= 0) && (8 <= (classIndexMask())))); + assert(((7 >= 0) && (7 <= (formatMask())))); + flag("endianness"); + longAtput(objOop, ((longAt(objOop)) & (~((0x1F << 24) + 0x3FFFFF))) + (8 + (7 << 24))); + /* begin storePointer:ofForwarder:withValue: */ + assert(isForwarded(objOop)); + assert(!(isOopForwarded(copy))); + if (isOldObject(objOop)) { + + /* most stores into young objects */ + + if (((copy & 3) == 0) + && ((((usqInt) copy)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(objOop))) >> 29) & 1) != 0)) { + remember(objOop); + } + } + } + longAtput((objOop + (BaseHeaderSize)) + (0 << 2), copy); + if ((byteAt(objOop + 7)) == 0) { + /* begin setRawNumSlotsOf:to: */ + flag("endian"); + byteAtput(objOop + 7, 1); + } + return limitSeg + bodySize; +} + + /* Ensure there are no forwarded literals in the argument. */ void @@ -65072,7 +65160,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -65318,7 +65406,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -65374,7 +65462,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-09-13 23:20:54 UTC (rev 3078) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ @@ -155,6 +155,7 @@ sqInt classIndexMask(void); sqInt classIndexOf(sqInt objOop); sqInt classOrNilAtIndex(sqInt classIndex); +sqInt classSmallInteger(void); sqInt classTableMajorIndexShift(void); sqInt classTableMinorIndexMask(void); sqInt classTablePageSize(void); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-13 00:35:44 UTC (rev 3077) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-09-13 23:20:54 UTC (rev 3078) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 from - CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade + CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.879 uuid: 44c718be-2a51-4e7e-9553-5def29daaade " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -801,6 +801,7 @@ sqInt ceClassAtIndex(sqInt classIndex); void ceSheduleScavenge(void); static void clearLeakMapAndMapAccessibleObjects(void); +static sqInt copyObjtoSegmentaddrstopAtsaveOopAt(sqInt objOop, sqInt segmentWordArray, sqInt limitSeg, sqInt stopAddr, sqInt oopPtr) NoDbgRegParms; void ensureNoForwardedLiteralsIn(sqInt aMethodObj); usqInt freeStartAddress(void); usqInt getScavengeThreshold(void); @@ -2327,7 +2328,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.879"; @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2014