Vm-dev January 2013

vm-dev@lists.squeakfoundation.org

27 participants
148 discussions

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 29 Jan '13

29 Jan '13

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 Author: eem Time: 12 December 2012, 1:34:04 am UUID: 79420af3-4595-4d68-8de0-e27fdd576dd4 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.37 Get plugin to use SA_ONSTACK/sigaltstack for signal handlers if loaded in the JIT. Correct some of the signal numbers. Depends on VMMaker.oscog-eem.233 as it no longer uses asSymbol.

1 0

Changing CogSimulator abi
by Lars 29 Jan '13

29 Jan '13

Hello Eliot, hello vm-dev, @vm-dev: I'm still sometimes working on cog ARM, but due to my studies I have little time. The problem I'm working on is that IA32 has a different function call ABI than ARM. While on IA32, you need to push the return address, on ARM, you load it into the LR-register. A design decision to accommodate this difference in the ARM JIT was to use IA32 ABI within all cog code, even when running on ARM. Only when calling the (compiled) interpreter, we use ARM ABI. The hope was, that this way we need to change little of the existing code. @all: In the last days of working (spread across several months), I implemented the Call opcode (which is used by cogit whenever a function is called) by pushing the return address before branching to the target (IA32 ABI). Also, I changed the trampoline generation to ask the compiler for the appropriate call opcode for the ABI (so far not committed), which is either Call in case of IA32 or BL in case of ARM. I'm not happy with that location for this behavior, but I don't know whether there exists a better place. Also, #hasLinkRegister is implemented on the compiler. Now, that calling the interpreter has changed, I run into the problem, that the simulator is expecting the stack pointer to point to the return address. The simulator is assuming IA32 ABI. How best to attribute for the changed ABI in the simulator? Subclass the simulator? On which level, VMSimulator or VMSimulatorLSB? That change would be orthogonal to the LSB subclass (if there ever will be a MSB subclass). Or introduce two classes which do know the ABI and are responsible for all places where ABI is used? Also the eventual changes to trampoline and enilopmart generation? Which problems might arise from this design decision with respect to the C-translation? All the best, Lars

2 2

[commit][2675] update sound system to use semaphore signalling, support restarting etc
by commits＠squeakvm.org 28 Jan '13

28 Jan '13

Revision: 2675 Author: rowledge Date: 2013-01-27 17:10:14 -0800 (Sun, 27 Jan 2013) Log Message: ----------- update sound system to use semaphore signalling, support restarting etc Modified Paths: -------------- trunk/platforms/RiscOS/misc/ToCopy/MakeFile trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c trunk/platforms/RiscOS/vm/dsc/block trunk/platforms/RiscOS/vm/sqRPCEvents.c trunk/platforms/RiscOS/vm/sqRPCMain.c Modified: trunk/platforms/RiscOS/misc/ToCopy/MakeFile =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/MakeFile 2013-01-24 20:08:41 UTC (rev 2674) +++ trunk/platforms/RiscOS/misc/ToCopy/MakeFile 2013-01-28 01:10:14 UTC (rev 2675) @@ -1,5 +1,5 @@ -# Project: squeak -# Make the pluginised VM for v3.9 +# Project: sq38plugin +# Make the pluginised VM for v3.8 # Reworked to use VMMaker non-copying of platform & cross files # Add check for Squeak3D dir to optionally compile the Squeak3D plugin # Ditto for HostWindow and LocalePlugin @@ -33,7 +33,7 @@ HWTestFile= $(SPlug).HostWindowPlugin.dsc.HostWindowPlugin LocaleTestFile= $(Plug).LocalePlugin.dsc.LocalePlugin -pluginList=B2DPlugin BitBltPlugin BMPReadWriterPlugin DSAPrims FFTPlugin FilePlugin FileCopyPlugin FloatArrayPlugin GeniePlugin JPEGReaderPlugin LargeIntegers Matrix2x3Plugin MiscPrimitivePlugin RePlugin SecurityPlugin SocketPlugin SoundPlugin StarSqueakPlugin SurfacePlugin ZipPlugin +pluginList= ADPCMCodecPlugin B2DPlugin BitBltPlugin BMPReadWriterPlugin DSAPrims FFTPlugin FilePlugin FileCopyPlugin FloatArrayPlugin GeniePlugin JPEGReaderPlugin LargeIntegers Matrix2x3Plugin MiscPrimitivePlugin RePlugin ScratchPlugin SecurityPlugin SocketPlugin SoundCodecPrims SoundGenerationPlugin SoundPlugin StarSqueakPlugin SurfacePlugin ZipPlugin # Final targets: all: plugins vm @@ -86,11 +86,13 @@ @.vm.o.ptrblock: $(Sqk).ptrblkmap rinkptr $(rinkptrflags) $(Sqk).ptrblkmap @.vm.o.ptrblock -$(Sqk).ptrblkmap: C:o.stubs @.vm.o.sqRPCMain @.vm.o.sqRPCWindows $(PVM).dsc.block +$(Sqk).ptrblkmap: C:o.stubs @.vm.o.sqRPCMain @.vm.o.sqRPCWindows \ + @.vm.o.sqRPCEvents $(PVM).dsc.block copy $(PVM).dsc.block $* f~c extractsym -e $* C:o.stubs,* extractsym -e $* @.vm.o.sqRPCMain extractsym -e $* @.vm.o.sqRPCWindows + extractsym -e $* @.vm.o.sqRPCEvents ########### # ADPCMCodecPlugin make rule. @@ -247,7 +249,6 @@ # FileCopyPlugin.c is generated # FileCopyPlugin.h is in Cross # sqRPCFileCopy.c is in RiscOS - ########### FileCopyPlugin: $(SqPlugins).FileCopyPlugin @echo done $* @@ -286,8 +287,26 @@ $(SPlug).FloatArrayPlugin.o.FloatArrayPlugin: $(SPlug).FloatArrayPlugin.c.FloatArrayPlugin $(PlHdr) cc $(ccflags) -o $@ $*.c +########### +# FloatMath Plugin make rule. +# Very simple, only the one source file +########### +FloatMathPlugin: $(SqPlugins).FloatMathPlugin + @echo done $* +$(SqPlugins).FloatMathPlugin: $(SPlug).FloatMathPlugin.o.FloatMathPlugin\ + $(SPlug).FloatMathPlugin.dsc.FloatMathPlugin \ + $(Sqk).ptrblkmap + rink -o $(SqPlugins).FloatMathPlugin \ + -h $(SPlug).FloatMathPlugin.dsc.FloatMathPlugin \ + -m $(Sqk).ptrblkmap \ + -a $(SPlug).FloatMathPlugin.o.FloatMathPlugin +$(SPlug).FloatMathPlugin.o.FloatMathPlugin: $(SPlug).FloatMathPlugin.c.FloatMathPlugin $(PlHdr) + cc $(ccflags) -o $@ $*.c + + + ########### # Genie Plugin make rule. # Very simple, only the one source file @@ -374,7 +393,6 @@ # LocalePlugin.c is generated # LocalePlugin.h is in Cross # sqRPCLocale.c is in RiscOS - ########### LocalePlugin: $(SqPlugins).LocalePlugin @echo done $* @@ -473,12 +491,36 @@ ########### +# Scratch Plugin make rule. +# More complex - involves files from several sources +# ScratchPlugin.c is generated +# ScratchPlugin.h is in Cross +# sqRPCScratch.c is in RiscOS +########### +ScratchPlugin: $(SqPlugins).ScratchPlugin + @echo done $* + +$(SqPlugins).ScratchPlugin: $(SPlug).ScratchPlugin.o.ScratchPlugin \ + $(SPlug).ScratchPlugin.o.sqRPCScratchOps \ + $(SPlug).ScratchPlugin.dsc.ScratchPlugin \ + $(Sqk).ptrblkmap + rink -o $(SqPlugins).ScratchPlugin \ + -h $(SPlug).ScratchPlugin.dsc.ScratchPlugin \ + -m $(Sqk).ptrblkmap \ + -a $(SPlug).ScratchPlugin.o.ScratchPlugin \ + $(SPlug).ScratchPlugin.o.sqRPCScratchOps + +$(SPlug).ScratchPlugin.o.ScratchPlugin: $(SPlug).ScratchPlugin.c.ScratchPlugin $(PlHdr) + cc $(ccflags) -I$(CPlug).ScratchPlugin -o $@ $*.c +$(SPlug).ScratchPlugin.o.sqRPCScratchOps: $(PPlug).ScratchPlugin.c.sqRPCScratchOps $(PlHdr) + cc $(ccflags) -I$(CPlug).ScratchPlugin -o $@ $(PPlug).ScratchPlugin.c.sqRPCScratchOps + +########### # Security Plugin make rule. # More complex - involves files from several sources # SecurityPlugin.c is generated # SecurityPlugin.h is in Cross # sqRPCSecurity.c is in RiscOS - ########### SecurityPlugin: $(SqPlugins).SecurityPlugin @echo done $* @@ -533,11 +575,57 @@ cc $(ccflags) -I$(PPlug).SocketPlugin,$(CPlug).SocketPlugin,$(Soklib) -o $@ $(PPlug).SocketPlugin.c.sqRPCNetPlugin ########### +# SoundCodec Plugin make rule. Bizarrely called SoundCodecPrims in use. +# More complex - involves files from several sources +# SoundCodecPrims.c is generated +# SoundCodecPrims.h is in Cross +# sqSoundCodecPluginBasicPrims.c is in Cross +########### +SoundCodecPrims: $(SqPlugins).SoundCodecPrims + @echo done $* + +$(SqPlugins).SoundCodecPrims: $(SPlug).SoundCodecPrims.o.SoundCodecPrims \ + $(SPlug).SoundCodecPrims.o.sqSoundCodecPluginBasicPrims \ + $(SPlug).SoundCodecPrims.dsc.SoundCodecPrims \ + $(Sqk).ptrblkmap + rink -o $(SqPlugins).SoundCodecPrims \ + -h $(SPlug).SoundCodecPrims.dsc.SoundCodecPrims \ + -m $(Sqk).ptrblkmap \ + -a $(SPlug).SoundCodecPrims.o.SoundCodecPrims \ + $(SPlug).SoundCodecPrims.o.sqSoundCodecPluginBasicPrims + +$(SPlug).SoundCodecPrims.o.SoundCodecPrims: $(SPlug).SoundCodecPrims.c.SoundCodecPrims $(PlHdr) + cc $(ccflags) -I$(CPlug).SoundCodecPrims -o $@ $*.c +$(SPlug).SoundCodecPrims.o.sqSoundCodecPluginBasicPrims: $(CPlug).SoundCodecPrims.c.sqSoundCodecPluginBasicPrims $(PlHdr) + cc $(ccflags) -I$(CPlug).sqSoundCodecPluginBasicPrims -o $@ $(CPlug).SoundCodecPrims.c.sqSoundCodecPluginBasicPrims + +########### +# SoundGeneration Plugin make rule. +# Very simple, only the one source file +########### +SoundGenerationPlugin: $(SqPlugins).SoundGenerationPlugin + @echo done $* + +$(SqPlugins).SoundGenerationPlugin: $(SPlug).SoundGenerationPlugin.o.SoundGenerationPlugin \ + $(SPlug).SoundGenerationPlugin.dsc.SoundGenerationPlugin \ + $(Sqk).ptrblkmap + rink -o $(SqPlugins).SoundGenerationPlugin \ + -h $(SPlug).SoundGenerationPlugin.dsc.SoundGenerationPlugin \ + -m $(Sqk).ptrblkmap \ + -a $(SPlug).SoundGenerationPlugin.o.SoundGenerationPlugin + +$(SPlug).SoundGenerationPlugin.o.SoundGenerationPlugin: $(SPlug).SoundGenerationPlugin.c.SoundGenerationPlugin $(PlHdr) + cc $(ccflags) -o $@ $*.c + + + +########### # Sound Plugin make rule. # More complex - involves files from several sources # SoundPlugin.c is generated # SoundPlugin.h is in Cross # sqRPCSound.c is in RiscOS + ########### SoundPlugin: $(SqPlugins).SoundPlugin @echo done $* Modified: trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW 2013-01-24 20:08:41 UTC (rev 2674) +++ trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW 2013-01-28 01:10:14 UTC (rev 2675) @@ -1,16 +1,20 @@ What to do next -This zipfile contains the basic !Squeak application; before you can do anything useful with it you will need to +This zipfile contains the basic !Squeak application for running Squeak systems from 2.8 up to 4.0; before you can do anything useful with it you will need to - 1) fetch three files a) the image and changelog files. The image file is the recorded state of a Squeak system and the changelog is a matching audit trail of what code changes have been made since a certain point in time. You can obtain those two files from the www.squeak.org site and visiting the downloads page and then going to the FTP archive - specifially ftp.squeak.org/4.0/Squeak4.0-basic.zip b) the sources file. - This is not the C/asm sources for the !Squeak application but the Smalltalk system code. This file is large and has all the Smalltalk code, all the class definitions and comments, for the system. It does not change very often and is not written to by the running system. It too can be obtained from the Squeak site, specifically ftp.squeak.org/4.0/SqueakV40.sources.gz + This is *not* the C/asm sources for the !Squeak application but the Smalltalk system code. This file is large and has all the Smalltalk code, all the class definitions and comments, for the system. It does not change very often and is not written to by the running system. It too can be obtained from the Squeak site, specifically ftp.squeak.org/4.0/SqueakV40.sources.gz 2) unzip the Squeak4.0-basic.zip file. You should end up with a file Squeak4/0-basic/image of size 13478196 bytes, and another file Squeak4/0-basic/changes of size 694 bytes. Change the filetype of the Squeak4/0-basic/image file to faa (STimage). If you don't know how to do this you will need to read that fine manual for RISC OS. 3) unzip the SqueakV40/sources/gz file - depending on exctly how you downloaded it you may find that it has already been decompressed. I don't know why that seems to happen. You should end up with SqueakV40/sources file of size 16748347 bytes. 4) move the SqueakV40/sources file *into the !Squeak application*. If you don't know how to do this you will need to read that fine manual for RISC OS. -5) While you have the aplication directory open, take a moment to *read the frickin !Help file* +5) While you have the application directory open, take a moment to *read the frickin !Help file* +To assist with getting keyboard input more effectively, you should download the DeepKeys module; open deepkeys2/zip and +If you want to be able to play sounds from Squeak you will have to install the StreamManager & SharedSoundBuffer modules that make it possible; open ssb.zip +and install it in the usual manner as described in the 'ReadFirst file within the package. + Now, you have an installation that can run. Double-click on the 'Squeak4/0-basic/image' file and wait a moment (it might take ten seconds or depending your disc speed etc) for it to be read in and started up. You should see a medium sized window labelled with the path of the image file and containing a number of slightly odd looking windows. For further help, read the contents of the www.squeak.org site, join the mailing list(s) and ask questions. \ No newline at end of file Modified: trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c =================================================================== --- trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c 2013-01-24 20:08:41 UTC (rev 2674) +++ trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c 2013-01-28 01:10:14 UTC (rev 2675) @@ -177,8 +177,7 @@ * copy the fName into the new entry so the fName string can be freed later */ OpenFileListEntry *entry; - entry = (OpenFileListEntry*) calloc(1, sizeof(OpenFileListEntry) + strlen(fN -ame)); + entry = (OpenFileListEntry*) calloc(1, sizeof(OpenFileListEntry) + strlen(fName)); if ( entry == NULL) { return NULL; } @@ -233,8 +232,7 @@ */ entry->refCt = -1; } - PRINTF(("\\t file entry %s (%0x):%d\n",entry->name, entry->handle, entry -->refCt)); + PRINTF(("\\t file entry %s (%0x):%d\n",entry->name, entry->handle, entry->refCt)); return entry; } /* the file is not open so open it */ @@ -270,8 +268,7 @@ /* primitive support */ -sqInt sqFileOpen(SQFile *f, char* sqFileName, sqInt sqFileNameSize, sqInt writeF -lag) { +sqInt sqFileOpen(SQFile *f, char* sqFileName, sqInt sqFileNameSize, sqInt writeFlag) { /* Opens the given file using the supplied sqFile structure * to record its state. Fails with no side effects if f is * already open. Files are always opened in binary mode; @@ -286,8 +283,7 @@ FAIL(); } - if (!canonicalizeFilenameToString(sqFileName, sqFileNameSize, cFilename)) FA -IL(); + if (!canonicalizeFilenameToString(sqFileName, sqFileNameSize, cFilename)) FAIL(); PRINTF(("\\t sqFileOpen: canonicalized filename: %s\n", cFilename)); @@ -332,8 +328,7 @@ PRINTF(("\\t sqFileClose: failed\n")); FAIL(); } - PRINTF(("\\t close file entry %s (%0x):%d\n",entry->name, entry->handle, ent -ry->refCt)); + PRINTF(("\\t close file entry %s (%0x):%d\n",entry->name, entry->handle, entry->refCt)); entry->refCt -= 2; if (entry->refCt == 0) { /* all uses closed, so close file and remove entry */ @@ -350,7 +345,6 @@ sqInt sqFileAtEnd(SQFile *f) { /* Return true if the file's read/write head is at the end of the file.*/ -int pntr; if (!sqFileValid(f)) { PRINTF(("\\t sqFileAtEnd: attempt to query invalid file\n")); @@ -361,15 +355,12 @@ squeakFileOffsetType sqFileGetPosition(SQFile *f) { /* Return the current position of the file's read/write head. */ -int pntr; -squeakFileOffsetType position; if (!sqFileValid(f)) { PRINTF(("\\t sqFileGetPosition: attempt to query invalid file\n")); FAIL(); } - PRINTF(("\\t sqFileGetPosition: file %x at %d\n", FILE_HANDLE(f), FILE_POSIT -ION(f))); + PRINTF(("\\t sqFileGetPosition: file %x at %d\n", FILE_HANDLE(f), FILE_POSITION(f))); return FILE_POSITION(f); } @@ -379,15 +370,13 @@ PRINTF(("\\t sqFileSetPosition: attempt to set invalid file\n")); FAIL(); } - PRINTF(("\\t sqFileSetPosition: file %x to %d\n", FILE_HANDLE(f), position)) -; + PRINTF(("\\t sqFileSetPosition: file %x to %d\n", FILE_HANDLE(f), position)); FILE_POSITION(f) = position; return true; } squeakFileOffsetType sqFileSize(SQFile *f) { /* Return the length of the given file. */ -int extent; if (!sqFileValid(f)) { PRINTF(("\\t sqFileSize: attempt to query invalid file\n")); FAIL(); @@ -414,8 +403,7 @@ return true; } -size_t sqFileReadIntoAt(SQFile *f, size_t count, char* byteArrayIndex, size_t st -artIndex) { +size_t sqFileReadIntoAt(SQFile *f, size_t count, char* byteArrayIndex, size_t startIndex) { /* Read count bytes from the given file into byteArray starting at * startIndex. byteArray is the address of the first byte of a * Squeak bytes object (e.g. String or ByteArray). startIndex @@ -433,13 +421,11 @@ xosgbpb_read_atw(FILE_HANDLE(f), dst, count, FILE_POSITION(f), &bytesUnread) ; FILE_POSITION(f) += (count - bytesUnread); - PRINTF(("\\t sqFileReadIntoAt: read %d bytes of %d from file %x to %0x\n",co -unt - bytesUnread, count, (int)FILE_HANDLE(f), (int)dst)); + PRINTF(("\\t sqFileReadIntoAt: read %d bytes of %d from file %x to %0x\n", count - bytesUnread, count, (int)FILE_HANDLE(f), (int)dst)); return count - bytesUnread; } -size_t sqFileWriteFromAt(SQFile *f, size_t count, char* byteArrayIndex, size_t s -tartIndex) { +size_t sqFileWriteFromAt(SQFile *f, size_t count, char* byteArrayIndex, size_t startIndex) { /* Write count bytes to the given writable file starting at startIndex * in the given byteArray. (See comment in sqFileReadIntoAt for interpretation * of byteArray and startIndex). @@ -453,11 +439,9 @@ FAIL(); } src = (byte *) (byteArrayIndex + startIndex); - xosgbpb_write_atw(FILE_HANDLE(f), src, count, FILE_POSITION(f), &bytesUnwrit -ten); + xosgbpb_write_atw(FILE_HANDLE(f), src, count, FILE_POSITION(f), &bytesUnwritten); FILE_POSITION(f) += (count - bytesUnwritten); - PRINTF(("\\t sqFileWriteFromAt: wrote %d bytes of %d from %0x to file %x\n", -count - bytesUnwritten, count, (int)src, (int)f->file)); + PRINTF(("\\t sqFileWriteFromAt: wrote %d bytes of %d from %0x to file %x\n", count - bytesUnwritten, count, (int)src, (int)f->file)); xosargs_read_extw(FILE_HANDLE(f), &extent); f->fileSize = extent; @@ -469,14 +453,11 @@ return count; } -sqInt sqFileRenameOldSizeNewSize(char* oldNameIndex, sqInt oldNameSize, char* ne -wNameIndex, sqInt newNameSize) { +sqInt sqFileRenameOldSizeNewSize(char* oldNameIndex, sqInt oldNameSize, char* newNameIndex, sqInt newNameSize) { char cNewName[MAXDIRNAMELENGTH]; - if (!canonicalizeFilenameToString(oldNameIndex, oldNameSize, cFilename)) FAI -L(); - if (!canonicalizeFilenameToString(newNameIndex, newNameSize, cNewName)) FAIL -(); + if (!canonicalizeFilenameToString(oldNameIndex, oldNameSize, cFilename)) FAIL(); + if (!canonicalizeFilenameToString(newNameIndex, newNameSize, cNewName)) FAIL(); if (xosfscontrol_rename(cFilename, cNewName) != NULL) { FAIL(); @@ -491,8 +472,7 @@ int size; fileswitch_attr attr; - if (!canonicalizeFilenameToString(sqFileName, sqFileNameSize, cFilename)) FA -IL();; + if (!canonicalizeFilenameToString(sqFileName, sqFileNameSize, cFilename)) FAIL();; PRINTF(("\\t sqFileDeleteNameSize: canonicalized name %s\n",cFilename)); @@ -509,7 +489,7 @@ return true; } -sqInt sqFileThisSession() { +sqInt sqFileThisSession(void) { return thisSession; } Modified: trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c =================================================================== --- trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c 2013-01-24 20:08:41 UTC (rev 2674) +++ trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c 2013-01-28 01:10:14 UTC (rev 2675) @@ -31,7 +31,7 @@ // relied on reading Andrew Sellors excellent code for !RDPClient. // Thank you both. -#define DEBUG +// #define DEBUG #include "sq.h" #include "SoundPlugin.h" @@ -40,16 +40,17 @@ -extern struct VirtualMachine * interpreterProxy; -static unsigned sound_initialised = false; -static int sound_handle = 0; -static int sound_stream = 0; -static unsigned sound_volume = 0; // this ought to be queriable from system +extern struct VirtualMachine * interpreterProxy; +static unsigned sound_initialised = false; +static int sound_handle = 0; +static int sound_stream = 0; +static unsigned sound_volume = 0; // this ought to be queriable from system static unsigned char *sound_global_buffer_data = NULL; -static int sound_global_buffer_length = 0; -static int sound_buffersize = 0; -static unsigned sound_delayed_start = false; -static unsigned int sound_delayed_start_time = 0; +static int sound_global_buffer_length = 0; +static int sound_buffersize = 0; +static unsigned int * soundPollWordAddr = 0; +static int soundPollBit = 0; +extern int setupSoundSignalling(unsigned int ** addr, int * flagBit, int semIndex); /*********************/ @@ -129,19 +130,28 @@ _kernel_swi(SWI_XOS_Bit | SWI_SharedSoundBuffer_SampleRate, &r, &r); } +static void ssb_streamend(int handle) { +// closes the stream but allows the buffers already filled to play out + PRINTF(("ssb_streamend %08X\n", handle)); + _kernel_swi_regs r; + + r.r[0] = (int)handle; + + _kernel_swi(SWI_XOS_Bit | SWI_SharedSoundBuffer_StreamEnd, &r, &r); +} + static void ssb_volume(int handle, unsigned int volume) { _kernel_swi_regs r; r.r[0] = (int)handle; r.r[1] = (int)volume; - sound_volume = volume; PRINTF(("ssb setsvolume\n")); _kernel_swi(SWI_XOS_Bit | SWI_SharedSoundBuffer_Volume, &r, &r); } static unsigned ssb_getvolume(int handle) { -// this really needs to be done with a query SWI +// this really needs to be done with a query SWI. Currently not implemented though PRINTF(("ssb getvolume\n")); return sound_volume; } @@ -201,6 +211,19 @@ _kernel_swi(SWI_XOS_Bit | SWI_StreamManager_SetDALimits, &r, &r); } +static int * sm_srcpollword(int stream, int flags, unsigned int * pollwordptr, int bittoset) { + _kernel_swi_regs r; + + r.r[0] = stream; + r.r[1] = flags; // only bit 0 has any effect + r.r[2] = (int)pollwordptr; + r.r[3] = bittoset; + PRINTF(("sm set src pollword stream: %d flag: %d ptr: %08X bit: %d\n", r.r[0], r.r[1], (int)(r.r[2]), r.r[3])); + + _kernel_swi(SWI_XOS_Bit | SWI_StreamManager_SrcPollWord, &r, &r); + return (int *)r.r[0]; +} + /**********************************/ /* module initialization/shutdown */ /**********************************/ @@ -214,8 +237,6 @@ sound_global_buffer_length = 0; sound_buffersize = 0; - sound_delayed_start = false; - sound_delayed_start_time = 0; PRINTF(("soundInit\n")); return true; } @@ -225,6 +246,7 @@ PRINTF(("soundShutdown\n")); if(sound_initialised){ + setupSoundSignalling(NULL, NULL, NULL); ssb_closestream(sound_handle); sound_initialised = false; } @@ -288,23 +310,25 @@ int snd_Start(int frameCount, int samplesPerSec, int stereo, int semaIndex) { // Start the buffered sound output with the given buffer size, sample rate, stereo flag and semaphore index. extern char sqTaskName[]; + PRINTF(("snd_Start")); -// just for now we won't mess with semaphores - if ( semaIndex ) { - PRINTF((" fails due to semaphore use\n")); - return false; - } + // looks a bit strange but first thing we do is shut down any pre-existing sound stream + soundShutdown(); if(!sound_initialised) { PRINTF((" initialising sound setup\n")); + // before bothering the sound sysem we check that RISC OS is ready for it + if ( !setupSoundSignalling(&soundPollWordAddr,&soundPollBit, semaIndex)) { + return false; + } sm_setdalimits(SOUND_DA_MAX_SIZE, SOUND_HEAP_MAX_SIZE); if(ssb_openstream(sqTaskName, true,BYTESFROMSAMPLES(frameCount), &sound_handle)) { if(ssb_returnstreamhandle(sound_handle, &sound_stream)) { sound_buffersize = SOUND_BUFFER_SIZE(frameCount); sm_setbuffer(sound_stream, sound_buffersize); ssb_volume(sound_handle, 0xFFFFFFFF); - ssb_samplerate(sound_handle, samplesPerSec << 10); - // uses 1/1024Hz, so multiply given rate by 1024 + ssb_samplerate(sound_handle, samplesPerSec << 10);// uses 1/1024Hz units + sm_srcpollword(sound_stream, 0, soundPollWordAddr, soundPollBit); ssb_pause(sound_handle, true); sound_initialised = true; } @@ -315,18 +339,28 @@ if(!sound_initialised){ sound_handle = 0; sound_stream = 0; + setupSoundSignalling(NULL, NULL, NULL); PRINTF(("snd_Start failed to init\n")); return false; } } PRINTF(("snd_Start initialised OK\n")); + return true; } int snd_Stop(void) { PRINTF(("snd_Stop\n")); - // soundShutdown(); - ssb_pause(sound_handle, true); + // cancel any further signalling + // setupSoundSignalling(NULL, NULL, NULL); + // // let the stream get to its end and then close + // if ( sound_initialised) { + // ssb_streamend(sound_handle); + // sound_handle = 0; + // sound_stream = 0; + // sound_initialised = false; + // } + soundShutdown(); return null; } @@ -334,12 +368,8 @@ void snd_Volume(double *left, double *right) { // used to GET the volume settings unsigned int leftVol, rightVol; - if (!sound_initialised) { - interpreterProxy->success(false); - PRINTF(("snd_Volume failed - sound not initialised\n")); - return; - } // get the volume and make doubles out if it +// there ought to be a SWI for this but currently we have to simply record it manually leftVol = sound_volume >> 16; rightVol = sound_volume & 0xFFFF; *left = leftVol / 65535.0; @@ -350,16 +380,14 @@ void snd_SetVolume(double left, double right) { // used to SET the volume settings unsigned int leftVol, rightVol; - if (!sound_initialised) { - interpreterProxy->success(false); - PRINTF(("snd_SetVolume failed - sound not initialised\n")); - return; - } leftVol = (unsigned int)((left > 1.0 ? 1.0 : left) * 0xFFFF) & 0xFFFF; rightVol = (unsigned int)((right > 1.0 ? 1.0 : right) * 0xFFFF) & 0xFFFF; + sound_volume = (leftVol << 16) | rightVol; PRINTF(("snd_SetVolume %f:%f\n", left, right)); - ssb_volume(sound_handle, (leftVol << 16) | rightVol); + if (sound_initialised) { + ssb_volume(sound_handle, sound_volume) ; + } } /***************/ Modified: trunk/platforms/RiscOS/vm/dsc/block =================================================================== --- trunk/platforms/RiscOS/vm/dsc/block 2013-01-24 20:08:41 UTC (rev 2674) +++ trunk/platforms/RiscOS/vm/dsc/block 2013-01-28 01:10:14 UTC (rev 2675) @@ -21,3 +21,4 @@ xscsifs_drives xadfs_drives xterritory_read_current_time_zone +uri_dispatch Modified: trunk/platforms/RiscOS/vm/sqRPCEvents.c =================================================================== --- trunk/platforms/RiscOS/vm/sqRPCEvents.c 2013-01-24 20:08:41 UTC (rev 2674) +++ trunk/platforms/RiscOS/vm/sqRPCEvents.c 2013-01-28 01:10:14 UTC (rev 2675) @@ -29,11 +29,12 @@ // and passes them up to Squeak // It makes use of the Celerica !!DeepKeys module // define this to get lots of debug notifiers -//#define DEBUG +// #define DEBUG #include "oslib/os.h" #include "oslib/osbyte.h" #include "oslib/osfscontrol.h" +#include "oslib/osmodule.h" #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" #include "oslib/colourtrans.h" @@ -42,7 +43,7 @@ wimp_block wimpPollBlock; wimp_event_no wimpPollEvent; -int wimpPollWord; +int wimpPollWord = 0; int windowActive = false; extern int pointerBuffer[]; extern os_coord pointerOffset; @@ -114,7 +115,9 @@ extern int forceInterruptCheck(void); extern int ioIconiseWindow(wimp_message * wblock); -void (*socketPollFunction)(int delay, int extraFd) = null; +void (*socketPollFunction)(int delay, int extraFd) = null; +int soundBufferEmptySemaphoreIndex = 0; +unsigned int * soundPollWordPtr = 0; /* Squeak expects to get kbd modifiers as the top 4bits of the 8bit char code, @@ -125,16 +128,16 @@ * Notice how Macish this is! */ -#define MacDownCursor 31 -#define MacUpCursor 30 -#define MacLeftCursor 28 -#define MacRightCursor 29 -#define MacHomeKey 1 -#define MacEndKey 4 -#define MacInsertKey 5 -#define MacDeleteKey 8 -#define MacPageUpKey 11 -#define MacPageDownKey 12 +#define MacDownCursor 31 +#define MacUpCursor 30 +#define MacLeftCursor 28 +#define MacRightCursor 29 +#define MacHomeKey 1 +#define MacEndKey 4 +#define MacInsertKey 5 +#define MacDeleteKey 8 +#define MacPageUpKey 11 +#define MacPageDownKey 12 unsigned char keymap[0x68] = { /* 0x00 Esc */ 0x1b , @@ -245,27 +248,27 @@ /*** Functions ***/ - void DisplayPixmap(wimp_draw * wblock); -extern void DisplayModeChanged(void); - void DoNothing(void); - int HandleEvents(void); - void KeyPressed( wimp_key * wblock); - void KeyBufAppend(int key); - void UserMessage(wimp_message * wblock); - void MouseButtons( wimp_pointer * wblock); - void PointerEnterWindow(wimp_entering *wblock); - void PointerLeaveWindow(wimp_leaving *wblock); - void WindowClose(wimp_close * wblock); - void WindowOpen( wimp_open * wblock); -extern void claimCaret(wimp_pointer * wblock); -extern void receivedClaimEntity(wimp_message * wblock); -extern void receivedDataRequest(wimp_message * wmessage); -extern void receivedDataSave(wimp_message * wblock); -extern void receivedDataSaveAck(wimp_message * wblock); - void EventBufAppendKey( int key, int buttons, int x, int y, int windowIndex); - void EventBufAppendMouse(int buttons, int modifiers, int x, int y, int windowIndex); -extern void platReportError( os_error * e); -void EventBufAppendWindow( int action, int left, int top, int right, int bottom,int windowIndex); +void DisplayPixmap(wimp_draw * wblock); +extern void DisplayModeChanged(void); +void DoNothing(void); +int HandleEvents(void); +void KeyPressed( wimp_key * wblock); +void KeyBufAppend(int key); +void UserMessage(wimp_message * wblock); +void MouseButtons( wimp_pointer * wblock); +void PointerEnterWindow(wimp_entering *wblock); +void PointerLeaveWindow(wimp_leaving *wblock); +void WindowClose(wimp_close * wblock); +void WindowOpen( wimp_open * wblock); +extern void claimCaret(wimp_pointer * wblock); +extern void receivedClaimEntity(wimp_message * wblock); +extern void receivedDataRequest(wimp_message * wmessage); +extern void receivedDataSave(wimp_message * wblock); +extern void receivedDataSaveAck(wimp_message * wblock); +void EventBufAppendKey( int key, int buttons, int x, int y, int windowIndex); +void EventBufAppendMouse(int buttons, int modifiers, int x, int y, int windowIndex); +extern void platReportError( os_error * e); +void EventBufAppendWindow( int action, int left, int top, int right, int bottom,int windowIndex); void setSocketPollFunction(int spf ) { /* called from SocketPlugin init code */ @@ -273,6 +276,57 @@ PRINTF(( "\\t socketPoll %0x\n", (int)socketPollFunction)); } +void initialiseSoundPollword(void) { +// create an RMA allocationfor the sound pollword to live in +os_error *e; + if (!soundPollWordPtr) { + // we need to allocate some memory in RMA space and 0 it + if ((e = xosmodule_alloc(4, (void **)&soundPollWordPtr)) != NULL) { + // damn, failed + platReportError(e); + return; + } + *soundPollWordPtr = 0; + PRINTF(("allocated pollword block %08X (%d)\n", (int)soundPollWordPtr, *soundPollWordPtr)); + } +} + +void shutdownSoundPollword(void) { +// free the RMA space used for the sound pollword +os_error *e; + if (soundPollWordPtr) { + if ((e = xosmodule_free(soundPollWordPtr)) != NULL) { + platReportError(e); + }; + soundPollWordPtr = 0; + } + return; +} + +int setupSoundSignalling(unsigned int ** addr, int * flagBit, int semIndex) { +// set the the sound buffer flagword address from an RMA allocation. +// set the bit in that flaword that the sound system should use (1 will do for now) +// we also have to keep track of the semaphore to signal when the pollword is +// triggered. For now, we'll use this fn to let the sound code tell us +// what it is + if (addr == NULL) { + // if the passed in addr is NULL, we're not polling anymore + soundBufferEmptySemaphoreIndex = 0; + return true; + } + + if (!soundPollWordPtr) { + // we were unabel to make the pollword RMA area, so fail + return false; + } + // pass in the pollword ptr + *addr = soundPollWordPtr; + *flagBit = 1; + soundBufferEmptySemaphoreIndex = semIndex; + PRINTF(("setupSoundSignalling ptr: %08X sem: %d\n", soundPollWordPtr, soundBufferEmptySemaphoreIndex)); + return true; +} + void setMetaKeyOptions(int swap) { if (swap) { user_LCTL_KEY = wimp_DEEPKEY_RCTL; @@ -420,33 +474,46 @@ /* null means no more interesting events, so return false*/ return false ; break; - case wimp_REDRAW_WINDOW_REQUEST : + case wimp_REDRAW_WINDOW_REQUEST: PRINTF(("\\t display\n")); - DisplayPixmap(&(pollBlock->redraw)); break; - case wimp_OPEN_WINDOW_REQUEST : - WindowOpen(&(pollBlock->open)); break; - case wimp_CLOSE_WINDOW_REQUEST : - WindowClose(&(pollBlock->close)); break; - case wimp_POINTER_LEAVING_WINDOW : - PointerLeaveWindow(&(pollBlock->leaving)); break; + DisplayPixmap(&(pollBlock->redraw)); + break; + case wimp_OPEN_WINDOW_REQUEST: + WindowOpen(&(pollBlock->open)); + break; + case wimp_CLOSE_WINDOW_REQUEST: + WindowClose(&(pollBlock->close)); + break; + case wimp_POINTER_LEAVING_WINDOW: + PointerLeaveWindow(&(pollBlock->leaving)); + break; case wimp_POINTER_ENTERING_WINDOW: - PointerEnterWindow(&(pollBlock->entering)); break; - case wimp_MOUSE_CLICK : - MouseButtons(&(pollBlock->pointer)); break; - case wimp_USER_DRAG_BOX : - DoNothing(); break; - case wimp_KEY_PRESSED : - KeyPressed( &(pollBlock->key)); break; - case wimp_MENU_SELECTION : - DoNothing(); break; - case wimp_SCROLL_REQUEST : - DoNothing(); break; - case wimp_USER_MESSAGE : - UserMessage(&(pollBlock->message)); break; - case wimp_USER_MESSAGE_RECORDED : - UserMessage(&(pollBlock->message)); break; - case wimp_USER_MESSAGE_ACKNOWLEDGE : - UserMessage(&(pollBlock->message)); break; + PointerEnterWindow(&(pollBlock->entering)); + break; + case wimp_MOUSE_CLICK: + MouseButtons(&(pollBlock->pointer)); + break; + case wimp_USER_DRAG_BOX: + DoNothing(); + break; + case wimp_KEY_PRESSED: + KeyPressed( &(pollBlock->key)); + break; + case wimp_MENU_SELECTION: + DoNothing(); + break; + case wimp_SCROLL_REQUEST: + DoNothing(); + break; + case wimp_USER_MESSAGE: + UserMessage(&(pollBlock->message)); + break; + case wimp_USER_MESSAGE_RECORDED: + UserMessage(&(pollBlock->message)); + break; + case wimp_USER_MESSAGE_ACKNOWLEDGE: + UserMessage(&(pollBlock->message)); + break; } return true; } @@ -460,6 +527,21 @@ } } +int HandleSoundPoll(void) { +// if there is a sound semaphore set up and a non-0 sound pollword address and the sound pollword +// has been tickled, 0 out the pollword and signal the semaphore + if ( soundBufferEmptySemaphoreIndex && (int)soundPollWordPtr) { + int pollwd; + pollwd = *soundPollWordPtr; +PRINTF(("HandleSoundPoll: %d\n", pollwd)); + if (pollwd) { + *soundPollWordPtr = 0; + signalSemaphoreWithIndex(soundBufferEmptySemaphoreIndex); + PRINTF(("signal sound semaphore:%d pollword: %d\n", soundBufferEmptySemaphoreIndex, pollwd)); + } + } +} + #if 0 /* this is pretty much obsolete - we can't do microsecond delays and * anything longer just slows Squeak down horribly */ @@ -495,7 +577,7 @@ //PRINTF(("\\t HandleEventsWithWait %d\n", pollDelay)); HandleMousePoll(); HandleSocketPoll(microSecondsToDelay); - do { xwimp_poll_idle((wimp_MASK_POLLWORD + do { xwimp_poll_idle(wimp_MASK_POLLWORD | wimp_MASK_GAIN | wimp_MASK_LOSE | wimp_SAVE_FP) , @@ -511,6 +593,7 @@ /* track buttons and pos, send event if any change */ HandleMousePoll(); HandleSocketPoll(0); + HandleSoundPoll(); //PRINTF(("\\t HandleEvents\n")); /* One poll to bring them all. * One poll to find them. @@ -733,7 +816,11 @@ } else { KeyBufAppend(keystate | ((modState)<<8)); } - PRINTF(("\\t KeyPressed .c%c .d%x keystate(%d-%d) w: %d\n", dblock->c, (dblock->deepkey)>>wimp_DEEPKEY_KEYNUMSHIFT, keystate, modState, thisWindowIndex)); + PRINTF(("\\t KeyPressed .c%c .d%x keystate(%d-%d) w: %d\n", + dblock->c, + (dblock->deepkey)>>wimp_DEEPKEY_KEYNUMSHIFT, + keystate, modState, + thisWindowIndex)); } void UserMessage(wimp_message * wblock) { Modified: trunk/platforms/RiscOS/vm/sqRPCMain.c =================================================================== --- trunk/platforms/RiscOS/vm/sqRPCMain.c 2013-01-24 20:08:41 UTC (rev 2674) +++ trunk/platforms/RiscOS/vm/sqRPCMain.c 2013-01-28 01:10:14 UTC (rev 2675) @@ -248,8 +248,10 @@ extern wimp_icon_create sqIconBarIcon; extern void GetDisplayParameters(void); extern void SetupWindowTitle(void); -extern void SetDefaultPointer(void); -extern void InitRootWindow(void); +extern void SetDefaultPointer(void); +extern void InitRootWindow(void); +extern int setupSoundSignalling(unsigned int ** addr, int * flagBit, int semIndex); +extern void initialiseSoundPollword(void); int width; SetDefaultPointer(); @@ -266,7 +268,7 @@ strncpy(sqTaskName, taskNameArg, sqTaskNameLength ); } - if ((e = xwimp_initialise (wimp_VERSION_RO35, + if ((e = xwimp_initialise (wimp_VERSION_RO38, sqTaskName, (wimp_message_list*)&importantWimpMessages, &actualOSLevel, @@ -308,8 +310,8 @@ SetupWindowTitle(); setFPStatus(0); - setTimer(); + initialiseSoundPollword(); return true; } @@ -336,6 +338,7 @@ */ extern void ioShutdownAllModules(void); extern void SetDefaultPointer(void); +extern void shutdownSoundPollword(void); ioShutdownAllModules(); @@ -346,11 +349,11 @@ xosdynamicarea_delete ( SqueakDisplayDA ); PRINTF(("\\t exiting Squeak\n")); if ( (int)logfile > 0) fclose( logfile); + shutdownSoundPollword(); } usqInt millisecondTimerValue(void) { /* return the raw unsigned value of the millsecond time for internal VM use */ -_kernel_swi_regs regs; return (usqInt)*timerValPtr; }

1 0

[commit][2674] changes to support sound output, modernise some parts and update the license
by commits＠squeakvm.org 24 Jan '13

24 Jan '13

Revision: 2674 Author: rowledge Date: 2013-01-24 12:08:41 -0800 (Thu, 24 Jan 2013) Log Message: ----------- changes to support sound output, modernise some parts and update the license Modified Paths: -------------- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!Help trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!run trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW trunk/platforms/RiscOS/plugins/FileCopyPlugin/sqRPCFileCopy.c trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c trunk/platforms/RiscOS/plugins/FilePlugin/sqRPCDirectory.c trunk/platforms/RiscOS/plugins/LocalePlugin/sqRPCLocale.c trunk/platforms/RiscOS/plugins/SecurityPlugin/sqRPCSecurity.c trunk/platforms/RiscOS/plugins/SocketPlugin/sqRPCNetPlugin.c trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c trunk/platforms/RiscOS/vm/config.h trunk/platforms/RiscOS/vm/fperrors.s trunk/platforms/RiscOS/vm/osExports.c trunk/platforms/RiscOS/vm/sqArgument.c trunk/platforms/RiscOS/vm/sqArguments.h trunk/platforms/RiscOS/vm/sqConfig.h trunk/platforms/RiscOS/vm/sqPlatformSpecific.h trunk/platforms/RiscOS/vm/sqRPCClipboard.c trunk/platforms/RiscOS/vm/sqRPCEvents.c trunk/platforms/RiscOS/vm/sqRPCExternalPrims.c trunk/platforms/RiscOS/vm/sqRPCFormPrint.c trunk/platforms/RiscOS/vm/sqRPCMain.c trunk/platforms/RiscOS/vm/sqRPCSyscall.c trunk/platforms/RiscOS/vm/sqRPCVersion.c trunk/platforms/RiscOS/vm/sqRPCWindows.c Removed Paths: ------------- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/ Modified: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!Help =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!Help 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!Help 2013-01-24 20:08:41 UTC (rev 2674) @@ -87,7 +87,7 @@ The legal bit ============= -The license under which Squeak is provided - the MIT License, with some portions covered by the Apache License version 2.0- can be found in full on http://www.squeak.org +The license under which Squeak is provided - the MIT License, with some portions covered by the Apache License version 2.0 - can be found in full on http://www.squeak.org Finally ------- Modified: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!run =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!run 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!run 2013-01-24 20:08:41 UTC (rev 2674) @@ -1,15 +1,17 @@ Wimpslot -min 400K -max 700k Set Squeak$Dir <Obey$Dir> -| Timers: we're either using the druck TimerMod or the Rik Griffin HALTimer - -| Make sure the MillisecondTimer & HALTimer module are loaded -RMEnsure HALTimer 0.03 RMLoad <Squeak$Dir>.modules.HALTimer +| Make sure the MillisecondTimer & HALTimer module are loaded +RMEnsure HALTimer 0.05 RMLoad <Squeak$Dir>.modules.HALTimer +RMEnsure HALTimer 0.05 Error You need HALTimer 0.05 or later RMEnsure MillisecondTimer 1.00 RMLoad <Squeak$Dir>.modules.MillisecondTimer -| -|RMEnsure TimerMod 4.12 RMLoad <Squeak$Dir>.modules.TimerMod.TimerMod +RMEnsure MillisecondTimer 1.00 Error You need MillisecondTimer 1.00 or later +| Sound support modules +RMEnsure StreamManager 0.03 RMLoad System:Modules.StreamMan +RMEnsure StreamManager 0.03 Error You need StreamManager 0.03 or later +RMEnsure SharedSoundBuffer 0.07 RMLoad System:Modules.SSBuffer +RMEnsure SharedSoundBuffer 0.07 You need SharedSoundBuffer 0.07 or later - | syntax: | {appname} [-vmoption [-vmoption]] imagefilepath [startupfile/URL] [imageoption [imageoption]] | vmoptions - Modified: trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW 2013-01-24 20:08:41 UTC (rev 2674) @@ -6,11 +6,11 @@ a) the image and changelog files. The image file is the recorded state of a Squeak system and the changelog is a matching audit trail of what code changes have been made since a certain point in time. You can obtain those two files from the www.squeak.org site and visiting the downloads page and then going to the FTP archive - specifially ftp.squeak.org/4.0/Squeak4.0-basic.zip b) the sources file. - This is not the sources for the !Squeak application but for the Smalltalk system code. This file is large and has all the Smalltalk code, all the class definitions and comments, for the system. It does not change very often and is not written to by the running system. It too can be obtained from the Squeak site, specifically ftp.squeak.org/4.0/SqueakV40.sources.gz + This is not the C/asm sources for the !Squeak application but the Smalltalk system code. This file is large and has all the Smalltalk code, all the class definitions and comments, for the system. It does not change very often and is not written to by the running system. It too can be obtained from the Squeak site, specifically ftp.squeak.org/4.0/SqueakV40.sources.gz 2) unzip the Squeak4.0-basic.zip file. You should end up with a file Squeak4/0-basic/image of size 13478196 bytes, and another file Squeak4/0-basic/changes of size 694 bytes. Change the filetype of the Squeak4/0-basic/image file to faa (STimage). If you don't know how to do this you will need to read that fine manual for RISC OS. 3) unzip the SqueakV40/sources/gz file - depending on exctly how you downloaded it you may find that it has already been decompressed. I don't know why that seems to happen. You should end up with SqueakV40/sources file of size 16748347 bytes. 4) move the SqueakV40/sources file *into the !Squeak application*. If you don't know how to do this you will need to read that fine manual for RISC OS. 5) While you have the aplication directory open, take a moment to *read the frickin !Help file* -Now, you have an installation that can run. Double-click on the Squeak4/0-basic/image file and wait a moment for it to be read in and started up. You should see a medium sized window labelled with the path of the image file and containing a number of slightly odd looking windows. For further help, read the contents of the www.squeak.org site, join the mailing list(s) and ask questions. \ No newline at end of file +Now, you have an installation that can run. Double-click on the 'Squeak4/0-basic/image' file and wait a moment (it might take ten seconds or depending your disc speed etc) for it to be read in and started up. You should see a medium sized window labelled with the path of the image file and containing a number of slightly odd looking windows. For further help, read the contents of the www.squeak.org site, join the mailing list(s) and ask questions. \ No newline at end of file Modified: trunk/platforms/RiscOS/plugins/FileCopyPlugin/sqRPCFileCopy.c =================================================================== --- trunk/platforms/RiscOS/plugins/FileCopyPlugin/sqRPCFileCopy.c 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/plugins/FileCopyPlugin/sqRPCFileCopy.c 2013-01-24 20:08:41 UTC (rev 2674) @@ -1,17 +1,34 @@ -/**************************************************************************/ -/* A Squeak VM for Acorn RiscOS machines by Tim Rowledge */ -/* tim(a)rowledge.org & http://www.rowledge.org/tim */ -/* Known to work on RiscOS >3.7 for StrongARM RPCs and Iyonix, */ -/* other machines not yet tested. */ -/* sqRPCFileCopy.c */ -/* hook up to RiscOS file copy to preserve filetypes etc */ -/**************************************************************************/ +// A Squeak VM for RiscOS machines +// Suited to RISC OS > 4, preferably > 5 +// See www.squeak.org for much more information +// +// tim Rowledge tim(a)rowledge.org +// +// License: MIT License - +// Copyright (C) <2013> <tim rowledge> +// +// 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. +// This is sqRPCFileCopy.c +// It implements a nasty little primitive that copies a file using the OS call +// that will keep the filetypes etc as-is. +// It wouldn't be needed if Squeak had a decent filesystem interface -/* To recompile this reliably you will need */ -/* OSLib - http://ro-oslib.sourceforge.net/ */ -/* Castle/AcornC/C++, the Acorn TCPIPLib */ -/* and a little luck */ -/* debugging stuff; can probably be deleted */ //#define DEBUG #include "oslib/os.h" #include "oslib/osfile.h" @@ -27,7 +44,7 @@ osfscontrol_copy_flags flag = osfscontrol_COPY_FORCE; - PRINTF(("\\t platcopy called\n")); + PRINTF(("\\t sqCopyFilesizetosize called\n")); if (!canonicalizeFilenameToString(srcName, srcNameSize, fromname)) return false; @@ -35,7 +52,7 @@ if (!canonicalizeFilenameToString(dstName, dstNameSize, toname)) return false; - PRINTF(("\\t platcopy names ok\n")); + PRINTF(("\\t sqCopyFilesizetosize file names ok\n")); e = xosfscontrol_copy( (char const *)fromname, @@ -44,7 +61,7 @@ (bits)0,(bits)0,(bits)0,(bits)0,(osfscontrol_descriptor *)0 ); if (e != NULL) return false; - PRINTF(("\\t platcopy ok\n")); + PRINTF(("\\t sqCopyFilesizetosize ok\n")); return true; } Modified: trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c =================================================================== --- trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c 2013-01-24 20:08:41 UTC (rev 2674) @@ -1,19 +1,36 @@ -/**************************************************************************/ -/* A Squeak VM for Acorn RiscOS machines by Tim Rowledge */ -/* tim(a)rowledge.org & http://www.rowledge.org/tim */ -/* Known to work on RiscOS >3.7 for StrongARM RPCs and Iyonix, */ -/* other machines not yet tested. */ -/* sqFilePluginBasicPrims.c */ -/* Replacement for the Cross/plugins/filePlugin/sqFilePluginBasicPrims.c */ -/* to attempt to provide multiple opening of writable files, thus */ -/* coping with the idiocy of the FileStream>readOnlyCopy method */ -/**************************************************************************/ +// A Squeak VM for RiscOS machines +// Suited to RISC OS > 4, preferably > 5 +// See www.squeak.org for much more information +// +// tim Rowledge tim(a)rowledge.org +// +// License: MIT License - +// Copyright (C) <2013> <tim rowledge> +// +// 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. +// This is sqFilePluginBasicPrims.c +// It provides the low level File calls for Squeak, with some twists to +// handle a few other-platform quirks, such as being able to open the ssame file +// for read amd read/write multiple times. +// and to keep life a little simpler within Squeak, RISC OS filenames +// are converted to a URL-lite format, mainly swapping the '/' for '.' -/* To recompile this reliably you will need */ -/* OSLib - http://ro-oslib.sourceforge.net/ */ -/* Castle/AcornC/C++, the Acorn TCPIPLib */ -/* and a little luck */ - /* define this to get lots of debug reports */ //#define DEBUG @@ -26,7 +43,7 @@ #include "oslib/osfscontrol.h" #include "oslib/osargs.h" #include "oslib/osgbpb.h" -#include "oslib/osfile.h" +#include "oslib/osfile.h" #include "sq.h" #include "FilePlugin.h" @@ -54,12 +71,17 @@ int sessionID; File *file; int writable; - squeakFileOffsetType fileSize; + squeakFileOffsetType fileSize; int lastOp; // 0 = uncommitted, 1 = read, 2 = write - (used for RISCOS specific code to hold file postion pointer) } SQFile; -For this perversion of the filesystem we need to do some trickery to attempt to persuade RISC OS to pretend to allow multiple openings of one file. The approach is to open files with SWIs and keep a list of canoncalized filenames. When opening a file we search for a matching filename and if found we use the same fileid number. Since Squeak uses a really annoying position/read/write api (to match posix I guess) we have to cache the position and use it in later read/writes. +For this perversion of the filesystem we need to do some trickery to attempt to +persuade RISC OS to pretend to allow multiple openings of one file. The approach + is to open files with SWIs and keep a list of canoncalized filenames. When open +ing a file we search for a matching filename and if found we use the same fileid + number. Since Squeak uses a really annoying position/read/write api (to match p +osix I guess) we have to cache the position and use it in later read/writes. w/r file not open (name not in list) @@ -73,7 +95,7 @@ w/r file open (name in list) -h = list entry->handle +h = list entry->handle sqFile->file = h sqFile->writable = true return @@ -155,7 +177,8 @@ * copy the fName into the new entry so the fName string can be freed later */ OpenFileListEntry *entry; - entry = (OpenFileListEntry*) calloc(1, sizeof(OpenFileListEntry) + strlen(fName)); + entry = (OpenFileListEntry*) calloc(1, sizeof(OpenFileListEntry) + strlen(fN +ame)); if ( entry == NULL) { return NULL; } @@ -210,7 +233,8 @@ */ entry->refCt = -1; } - PRINTF(("\\t file entry %s (%0x):%d\n",entry->name, entry->handle, entry->refCt)); + PRINTF(("\\t file entry %s (%0x):%d\n",entry->name, entry->handle, entry +->refCt)); return entry; } /* the file is not open so open it */ @@ -246,7 +270,8 @@ /* primitive support */ -sqInt sqFileOpen(SQFile *f, char* sqFileName, sqInt sqFileNameSize, sqInt writeFlag) { +sqInt sqFileOpen(SQFile *f, char* sqFileName, sqInt sqFileNameSize, sqInt writeF +lag) { /* Opens the given file using the supplied sqFile structure * to record its state. Fails with no side effects if f is * already open. Files are always opened in binary mode; @@ -261,7 +286,8 @@ FAIL(); } - if (!canonicalizeFilenameToString(sqFileName, sqFileNameSize, cFilename)) FAIL(); + if (!canonicalizeFilenameToString(sqFileName, sqFileNameSize, cFilename)) FA +IL(); PRINTF(("\\t sqFileOpen: canonicalized filename: %s\n", cFilename)); @@ -275,7 +301,7 @@ f->writable = true; FAIL(); } - + if (writeFlag) { f->writable = true; } else { @@ -306,7 +332,8 @@ PRINTF(("\\t sqFileClose: failed\n")); FAIL(); } - PRINTF(("\\t close file entry %s (%0x):%d\n",entry->name, entry->handle, entry->refCt)); + PRINTF(("\\t close file entry %s (%0x):%d\n",entry->name, entry->handle, ent +ry->refCt)); entry->refCt -= 2; if (entry->refCt == 0) { /* all uses closed, so close file and remove entry */ @@ -341,7 +368,8 @@ PRINTF(("\\t sqFileGetPosition: attempt to query invalid file\n")); FAIL(); } - PRINTF(("\\t sqFileGetPosition: file %x at %d\n", FILE_HANDLE(f), FILE_POSITION(f))); + PRINTF(("\\t sqFileGetPosition: file %x at %d\n", FILE_HANDLE(f), FILE_POSIT +ION(f))); return FILE_POSITION(f); } @@ -351,7 +379,8 @@ PRINTF(("\\t sqFileSetPosition: attempt to set invalid file\n")); FAIL(); } - PRINTF(("\\t sqFileSetPosition: file %x to %d\n", FILE_HANDLE(f), position)); + PRINTF(("\\t sqFileSetPosition: file %x to %d\n", FILE_HANDLE(f), position)) +; FILE_POSITION(f) = position; return true; } @@ -360,7 +389,7 @@ /* Return the length of the given file. */ int extent; if (!sqFileValid(f)) { - PRINTF(("\\t sqFileSize: attempt to query invalid file\n")); + PRINTF(("\\t sqFileSize: attempt to query invalid file\n")); FAIL(); } return f->fileSize; @@ -379,13 +408,14 @@ if (!sqFileValid(f)) FAIL(); if (xosargs_set_extw(FILE_HANDLE(f), offset) != NULL) { FAIL(); - } + } xosargs_read_extw(FILE_HANDLE(f), &extent); f->fileSize = extent; return true; } -size_t sqFileReadIntoAt(SQFile *f, size_t count, char* byteArrayIndex, size_t startIndex) { +size_t sqFileReadIntoAt(SQFile *f, size_t count, char* byteArrayIndex, size_t st +artIndex) { /* Read count bytes from the given file into byteArray starting at * startIndex. byteArray is the address of the first byte of a * Squeak bytes object (e.g. String or ByteArray). startIndex @@ -400,13 +430,16 @@ } dst = (byte *) (byteArrayIndex + startIndex); - xosgbpb_read_atw(FILE_HANDLE(f), dst, count, FILE_POSITION(f), &bytesUnread); + xosgbpb_read_atw(FILE_HANDLE(f), dst, count, FILE_POSITION(f), &bytesUnread) +; FILE_POSITION(f) += (count - bytesUnread); - PRINTF(("\\t sqFileReadIntoAt: read %d bytes of %d from file %x to %0x\n",count - bytesUnread, count, (int)FILE_HANDLE(f), (int)dst)); + PRINTF(("\\t sqFileReadIntoAt: read %d bytes of %d from file %x to %0x\n",co +unt - bytesUnread, count, (int)FILE_HANDLE(f), (int)dst)); return count - bytesUnread; } -size_t sqFileWriteFromAt(SQFile *f, size_t count, char* byteArrayIndex, size_t startIndex) { +size_t sqFileWriteFromAt(SQFile *f, size_t count, char* byteArrayIndex, size_t s +tartIndex) { /* Write count bytes to the given writable file starting at startIndex * in the given byteArray. (See comment in sqFileReadIntoAt for interpretation * of byteArray and startIndex). @@ -420,9 +453,11 @@ FAIL(); } src = (byte *) (byteArrayIndex + startIndex); - xosgbpb_write_atw(FILE_HANDLE(f), src, count, FILE_POSITION(f), &bytesUnwritten); + xosgbpb_write_atw(FILE_HANDLE(f), src, count, FILE_POSITION(f), &bytesUnwrit +ten); FILE_POSITION(f) += (count - bytesUnwritten); - PRINTF(("\\t sqFileWriteFromAt: wrote %d bytes of %d from %0x to file %x\n",count - bytesUnwritten, count, (int)src, (int)f->file)); + PRINTF(("\\t sqFileWriteFromAt: wrote %d bytes of %d from %0x to file %x\n", +count - bytesUnwritten, count, (int)src, (int)f->file)); xosargs_read_extw(FILE_HANDLE(f), &extent); f->fileSize = extent; @@ -434,11 +469,14 @@ return count; } -sqInt sqFileRenameOldSizeNewSize(char* oldNameIndex, sqInt oldNameSize, char* newNameIndex, sqInt newNameSize) { +sqInt sqFileRenameOldSizeNewSize(char* oldNameIndex, sqInt oldNameSize, char* ne +wNameIndex, sqInt newNameSize) { char cNewName[MAXDIRNAMELENGTH]; - if (!canonicalizeFilenameToString(oldNameIndex, oldNameSize, cFilename)) FAIL(); - if (!canonicalizeFilenameToString(newNameIndex, newNameSize, cNewName)) FAIL(); + if (!canonicalizeFilenameToString(oldNameIndex, oldNameSize, cFilename)) FAI +L(); + if (!canonicalizeFilenameToString(newNameIndex, newNameSize, cNewName)) FAIL +(); if (xosfscontrol_rename(cFilename, cNewName) != NULL) { FAIL(); @@ -453,7 +491,8 @@ int size; fileswitch_attr attr; - if (!canonicalizeFilenameToString(sqFileName, sqFileNameSize, cFilename)) FAIL();; + if (!canonicalizeFilenameToString(sqFileName, sqFileNameSize, cFilename)) FA +IL();; PRINTF(("\\t sqFileDeleteNameSize: canonicalized name %s\n",cFilename)); Modified: trunk/platforms/RiscOS/plugins/FilePlugin/sqRPCDirectory.c =================================================================== --- trunk/platforms/RiscOS/plugins/FilePlugin/sqRPCDirectory.c 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/plugins/FilePlugin/sqRPCDirectory.c 2013-01-24 20:08:41 UTC (rev 2674) @@ -1,16 +1,32 @@ -/**************************************************************************/ -/* A Squeak VM for Acorn RiscOS machines by Tim Rowledge */ -/* tim(a)rowledge.org & http://www.rowledge.org/tim */ -/* Known to work on RiscOS >3.7 for StrongARM RPCs and Iyonix, */ -/* other machines not yet tested. */ -/* sqRPCDirectory.c */ -/* hook up to RiscOS directory listing etc */ -/**************************************************************************/ +// A Squeak VM for RiscOS machines +// Suited to RISC OS > 4, preferably > 5 +// See www.squeak.org for much more information +// +// tim Rowledge tim(a)rowledge.org +// +// License: MIT License - +// Copyright (C) <2013> <tim rowledge> +// +// 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. +// This is sqRPCFileDirectory.c +// It provides the Squeak directory related low-level calls -/* To recompile this reliably you will need */ -/* OSLib - http://ro-oslib.sourceforge.net/ */ -/* Castle/AcornC/C++, the Acorn TCPIPLib */ -/* and a little luck */ /* debugging stuff; uncommnet for debugging trace */ //#define DEBUG #include "oslib/os.h" @@ -64,7 +80,7 @@ /* Remove the centiseconds from the time. * 0x1000000000 / 100 = 42949672.96 */ - low = (low / 100) + (high * 42949673U); + low = (low / 100) + (high * 42949673U); low -= (high / 25); /* compensate for that 0.04 error. */ return (int)low + (tzoffset/100); @@ -135,13 +151,13 @@ goto decode_disc_id; } run_total += scsifs_flop; - + if ( context < (run_total + scsifs_hard) ) { // it's a scsifs hard disc sprintf( discid, "SCSI::%d", context - run_total + F2HJump); goto decode_disc_id; } - run_total += scsifs_hard; + run_total += scsifs_hard; xramfs_drives (&junk, &ramfs_flop, &ramfs_hard); if ( context < ( run_total + ramfs_flop) ) { @@ -149,13 +165,13 @@ sprintf( discid, "RAM::%d", context - run_total); goto decode_disc_id; } - run_total += ramfs_flop; + run_total += ramfs_flop; if ( context < (run_total + ramfs_hard) ) { // it's a ramfs hard disc sprintf( discid, "RAM::%d", context - run_total + F2HJump); goto decode_disc_id; } - run_total += ramfs_hard; + run_total += ramfs_hard; xcdfs_get_number_of_drives( &cdfs_hard); if ( context < (run_total + cdfs_hard) ) { @@ -263,7 +279,7 @@ */ strncpy(name, filename, filenamesize); name[filenamesize] = null; - PRINTF(("\\tsettype of %s \n", name)); + PRINTF(("\\tsettype of %s \n", name)); if (strstr(name, ".$.") ) { /* .$. is a strong hint that the name is already in RISC OS form */ xosfile_set_type(name, (bits)0xFAA); Modified: trunk/platforms/RiscOS/plugins/LocalePlugin/sqRPCLocale.c =================================================================== --- trunk/platforms/RiscOS/plugins/LocalePlugin/sqRPCLocale.c 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/plugins/LocalePlugin/sqRPCLocale.c 2013-01-24 20:08:41 UTC (rev 2674) @@ -1,16 +1,32 @@ -/**************************************************************************/ -/* A Squeak VM for Acorn RiscOS machines by Tim Rowledge */ -/* tim(a)rowledge.org & http://www.rowledge.org/tim */ -/* Known to work on RiscOS >3.7 for StrongARM RPCs and Iyonix, */ -/* other machines not yet tested. */ -/* sqRPCLocale.c */ -/**************************************************************************/ +// A Squeak VM for RiscOS machines +// Suited to RISC OS > 4, preferably > 5 +// See www.squeak.org for much more information +// +// tim Rowledge tim(a)rowledge.org +// +// License: MIT License - +// Copyright (C) <2013> <tim rowledge> +// +// 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. +// This is sqRPCLocale.c +// It provides locale/territory calls for Squeak -/* To recompile this reliably you will need */ -/* OSLib - http://ro-oslib.sourceforge.net/ */ -/* Castle/AcornC/C++, the Acorn TCPIPLib */ -/* and a little luck */ - /* define this to get lots of debug reports */ //#define DEBUG Modified: trunk/platforms/RiscOS/plugins/SecurityPlugin/sqRPCSecurity.c =================================================================== --- trunk/platforms/RiscOS/plugins/SecurityPlugin/sqRPCSecurity.c 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/plugins/SecurityPlugin/sqRPCSecurity.c 2013-01-24 20:08:41 UTC (rev 2674) @@ -1,16 +1,33 @@ -/**************************************************************************/ -/* A Squeak VM for Acorn RiscOS machines by Tim Rowledge */ -/* tim(a)rowledge.org & http://www.rowledge.org/tim */ -/* Known to work on RiscOS >3.7 for StrongARM RPCs and Iyonix, */ -/* other machines not yet tested. */ -/* sqRPCSecurity.c */ -/* Connect to Squeak's security stuff */ -/**************************************************************************/ +// A Squeak VM for RiscOS machines +// Suited to RISC OS > 4, preferably > 5 +// See www.squeak.org for much more information +// +// tim Rowledge tim(a)rowledge.org +// +// License: MIT License - +// Copyright (C) <2013> <tim rowledge> +// +// 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. +// This is sqRPCSecurity.c +// It provides some filesysem security apis - you can set up a directory as +// a 'trusted' place for users data, or restrict saving of the image file etc -/* To recompile this reliably you will need */ -/* OSLib - http://ro-oslib.sourceforge.net/ */ -/* Castle/AcornC/C++, the Acorn TCPIPLib */ -/* and a little luck */ /* debugging stuff; uncomment for debugging trace */ //#define DEBUG Modified: trunk/platforms/RiscOS/plugins/SocketPlugin/sqRPCNetPlugin.c =================================================================== --- trunk/platforms/RiscOS/plugins/SocketPlugin/sqRPCNetPlugin.c 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/plugins/SocketPlugin/sqRPCNetPlugin.c 2013-01-24 20:08:41 UTC (rev 2674) @@ -1,16 +1,33 @@ -/**************************************************************************/ -/* A Squeak VM for Acorn RiscOS machines by Tim Rowledge */ -/* tim(a)rowledge.org & http://www.rowledge.org/tim */ -/* Known to work on RiscOS >3.7 for StrongARM RPCs and Iyonix, */ -/* other machines not yet tested. */ -/* sqRPCNetPlugin.c */ -/* hook up to RiscOS socket stuff */ -/**************************************************************************/ +// A Squeak VM for RiscOS machines +// Suited to RISC OS > 4, preferably > 5 +// See www.squeak.org for much more information +// +// tim Rowledge tim(a)rowledge.org +// +// License: MIT License - +// Copyright (C) <2013> <tim rowledge> +// +// 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. -/* To recompile this reliably you will need */ -/* OSLib - http://ro-oslib.sourceforge.net/ */ -/* Castle/AcornC/C++, the Acorn TCPIPLib */ -/* and a little luck */ +// This is sqRPCNetPlugin.c +// It provides unix like sockets for Squeak. +// If you understand sockets and RISC OS, feel free to offer to improve it. /* Shamelessly copied from Unix socket support. * @@ -19,52 +36,52 @@ */ /* sqUnixSocket.c -- Unix socket support - * + * * Copyright (C) 1996-2003 Ian Piumarta and other authors/contributors * as listed elsewhere in this file. * All rights reserved. - * + * * You are NOT ALLOWED to distribute modified versions of this file * under its original name. If you want to modify it and then make * your modifications available publicly, rename the file first. - * + * * This file is part of Unix Squeak. - * + * * This file is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. - * + * * You may use and/or distribute this file ONLY as part of Squeak, under * the terms of the Squeak License as described in `LICENSE' in the base of * this distribution, subject to the following additional restrictions: - * + * * 1. The origin of this software must not be misrepresented; you must not * claim that you wrote the original software. If you use this software * in a product, an acknowledgment to the original author(s) (and any * other contributors mentioned herein) in the product documentation * would be appreciated but is not required. - * + * * 2. You must not distribute (or make publicly available by any * means) a modified copy of this file unless you first rename it. - * + * * 3. This notice must not be removed or altered in any source distribution. - * + * * Using (or modifying this file for use) in any context other than Squeak * changes these copyright conditions. Read the file `COPYING' in the * directory `platforms/unix/doc' before proceeding with any such use. */ /* Author: Ian.Piumarta(a)inria.fr - * + * * Last edited: 2004-04-02 14:21:17 by piumarta on emilia.local - * + * * Support for BSD-style "accept" primitives contributed by: * Lex Spoon <lex(a)cc.gatech.edu> - * + * * Notes: * Sockets are completely asynchronous, but the resolver is still * synchronous. - * + * * BUGS: * Now that the image has real UDP primitives, the TCP/UDP duality in * many of the connection-oriented functions should be removed and @@ -113,7 +130,7 @@ # include <netdb.h> # include <errno.h> # include <unistd.h> - + #endif /* !ACORN */ /* Solaris sometimes fails to define this in netdb.h */ @@ -286,7 +303,7 @@ FD_ZERO(&exMask); FD_ZERO(&xdMask); maxFd= 0; -#ifndef ACORN +#ifndef ACORN signal(SIGPIPE, SIG_IGN); #endif } @@ -309,7 +326,7 @@ } while (maxFd && !FD_ISSET(maxFd - 1, &fdMask)) --maxFd; -#ifndef ACORN +#ifndef ACORN signal(SIGPIPE, SIG_DFL); #endif } @@ -568,7 +585,7 @@ { struct timeval tv= { 0, 0 }; fd_set fds; - + FD_ZERO(&fds); FD_SET(s, &fds); return select(s+1, 0, &fds, 0, &tv) > 0; @@ -987,7 +1004,7 @@ void sqSocketAcceptFromRecvBytesSendBytesSemaID(SocketPtr s, SocketPtr serverSocket, sqInt recvBufSize, sqInt sendBufSize, sqInt semaIndex){ sqSocketAcceptFromRecvBytesSendBytesSemaIDReadSemaIDWriteSemaID - (s, serverSocket, recvBufSize, sendBufSize, + (s, serverSocket, recvBufSize, sendBufSize, semaIndex, semaIndex, semaIndex); } @@ -1098,7 +1115,7 @@ } -/* Release the resources associated with this socket. +/* Release the resources associated with this socket. If a connection is open, abort it. */ void sqSocketDestroy(SocketPtr s) @@ -1308,7 +1325,7 @@ /* write data to the socket s from buf for at most bufSize bytes. answer the number of bytes actually written. -*/ +*/ sqInt sqSocketSendDataBufCount(SocketPtr s, char * buf, sqInt bufSize) { int nsent= 0; @@ -1361,7 +1378,7 @@ /* read data from the UDP socket s into buf for at most bufSize bytes. answer the number of bytes actually read. -*/ +*/ sqInt sqSocketReceiveUDPDataBufCountaddressportmoreFlag (SocketPtr s, char * buf, sqInt bufSize, sqInt *address, sqInt *port, sqInt *moreFlag) { @@ -1372,7 +1389,7 @@ FPRINTF((stderr, "recvFrom(%d)\n", SOCKET(s))); memset(&saddr, 0, sizeof(saddr)); - { + { int nread= recvfrom(SOCKET(s), (void *)buf, bufSize, 0, (struct sockaddr *)&saddr, &addrSize); @@ -1395,7 +1412,7 @@ /* write data to the UDP socket s from buf for at most bufSize bytes. * answer the number of bytes actually written. - */ + */ sqInt sqSockettoHostportSendDataBufCount(SocketPtr s, sqInt address, sqInt port, char * buf, sqInt bufSize) { @@ -1414,7 +1431,7 @@ sizeof(saddr)); if (nsent >= 0) return nsent; - + if (errno == EWOULDBLOCK) /* asynchronous write in progress */ return 0; FPRINTF((stderr, "UDP send failed\n")); @@ -1605,7 +1622,7 @@ interpreterProxy->success(false); return errno; } - + void sqSocketBindToPort(SocketPtr s, int addr, int port) { int result; Modified: trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c =================================================================== --- trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c 2013-01-24 20:08:41 UTC (rev 2674) @@ -1,31 +1,234 @@ -/**************************************************************************/ -/* A Squeak VM for Acorn RiscOS machines by Tim Rowledge */ -/* tim(a)rowledge.org & http://www.rowledge.org/tim */ -/* Known to work on RiscOS >3.7 for StrongARM RPCs and Iyonix, */ -/* other machines not yet tested. */ -/* sqRPCSound.c */ -/* hook up to RiscOS sound stuff - eventually */ -/**************************************************************************/ +// A Squeak VM for RiscOS machines +// Suited to RISC OS > 4, preferably > 5 +// See www.squeak.org for much more information +// +// tim Rowledge tim(a)rowledge.org +// +// License: MIT License - +// Copyright (C) <2013> <tim rowledge> +// +// 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. +// This is sqRPCSound.c +// It provides Squeak with access to the RISC OS sound system as +// implemented by John Duffell's very neat SharedSoundBuffer/StreamManager +// modules. Furthermore, my understanding of how to make use of John's modules +// relied on reading Andrew Sellors excellent code for !RDPClient. +// Thank you both. -/* To recompile this reliably you will need */ -/* OSLib - http://ro-oslib.sourceforge.net/ */ -/* Castle/AcornC/C++, the Acorn TCPIPLib */ -/* and a little luck */ +#define DEBUG #include "sq.h" #include "SoundPlugin.h" +#include "kernel.h" +#include "sqRPCSound.h" + extern struct VirtualMachine * interpreterProxy; +static unsigned sound_initialised = false; +static int sound_handle = 0; +static int sound_stream = 0; +static unsigned sound_volume = 0; // this ought to be queriable from system +static unsigned char *sound_global_buffer_data = NULL; +static int sound_global_buffer_length = 0; +static int sound_buffersize = 0; +static unsigned sound_delayed_start = false; +static unsigned int sound_delayed_start_time = 0; + +/*********************/ +/* internal routines */ +/*********************/ + + +static void ssb_closestream(int handle) { + _kernel_swi_regs r; + PRINTF(("ssb close %d\n", handle)); + + r.r[0] = (int)handle; + + _kernel_swi(SWI_XOS_Bit | SWI_SharedSoundBuffer_CloseStream, &r, &r); +} + +static unsigned ssb_openstream(char *name, unsigned set_expected_size, int expected_size, int *handle) { + _kernel_swi_regs r; + unsigned success = false; + int flags = 0; + + PRINTF(("ssb open %s expected size: %d", name, expected_size)); + + if(set_expected_size) + flags = flags | 0x2; + + r.r[0] = (int)flags; + r.r[1] = (int)name; + r.r[2] = expected_size; // might be 0, see flag setting above + + if(_kernel_swi(SWI_XOS_Bit | SWI_SharedSoundBuffer_OpenStream, &r, &r) == NULL) + success = true; + + *handle = (unsigned int)r.r[0]; + + if (success) { + PRINTF((" - suceeded with handle: %d\n", handle)); + } else { + PRINTF((" failed\n")); + }; + return(success); +} + +static void ssb_pause(int handle, unsigned pause) { + _kernel_swi_regs r; + + r.r[0] = (int)handle; + r.r[1] = (int)(pause ? 0 : 1); + + if (pause) {PRINTF(("ssb pause\n"));} else {PRINTF(("ssb un-pause\n"));} + + _kernel_swi(SWI_XOS_Bit | SWI_SharedSoundBuffer_Pause, &r, &r); +} + +static unsigned ssb_returnstreamhandle(int handle, int *stream) { + _kernel_swi_regs r; + + *stream = 0; + r.r[0] = (int)handle; + if(_kernel_swi(SWI_XOS_Bit | SWI_SharedSoundBuffer_ReturnStreamHandle, &r, &r) == 0) { + *stream = r.r[0]; + PRINTF(("ssb returnstreamhandle: %d\n", *stream)); + return true; + } + PRINTF(("ssb returnstreamhandle: failed\n")); + + return false; +} + +static void ssb_samplerate(int handle, int samplerate) { + _kernel_swi_regs r; + + r.r[0] = (int)handle; + r.r[1] = (int)samplerate; + + PRINTF(("ssb setsamplerate: %d\n", samplerate>>10)); + _kernel_swi(SWI_XOS_Bit | SWI_SharedSoundBuffer_SampleRate, &r, &r); +} + +static void ssb_volume(int handle, unsigned int volume) { + _kernel_swi_regs r; + + r.r[0] = (int)handle; + r.r[1] = (int)volume; + sound_volume = volume; + + PRINTF(("ssb setsvolume\n")); + _kernel_swi(SWI_XOS_Bit | SWI_SharedSoundBuffer_Volume, &r, &r); +} + +static unsigned ssb_getvolume(int handle) { +// this really needs to be done with a query SWI + PRINTF(("ssb getvolume\n")); + return sound_volume; +} + +static unsigned sm_addblock(int stream, unsigned char *block, int length) { + _kernel_swi_regs r; + + r.r[0] = (int)stream; + r.r[1] = (int)block; + r.r[2] = (int)length; + + if(_kernel_swi(SWI_XOS_Bit | SWI_StreamManager_AddBlock, &r, &r) == NULL) { + PRINTF(("sm addblock on stream: %d length: %d\n", stream, length)); + return true; + } + PRINTF(("sm addblock: failed\n")); + + return false; +} + +static int sm_bufferstats(int stream) { + _kernel_swi_regs r; + int bytes_left = 0; + + r.r[0] = (int)stream; + + if(_kernel_swi(SWI_XOS_Bit | SWI_StreamManager_BufferStats, &r, &r) == 0) + bytes_left = r.r[0] - r.r[1]; + PRINTF(("sm bufferstats: %d\n", bytes_left)); + + /* This doesn't match the supposed doc + * r0 = added + * r1 = played + * r2 = freed + */ + + return(bytes_left); +} + +static void sm_setbuffer(int stream, int max_bytes) { + _kernel_swi_regs r; + + r.r[0] = (int)stream; + r.r[1] = (int)max_bytes; + PRINTF(("sm setbuffer\n")); + + _kernel_swi(SWI_XOS_Bit | SWI_StreamManager_SetBuffer, &r, &r); +} + +static void sm_setdalimits(int da_max_bytes, int heap_max_bytes) { + _kernel_swi_regs r; + + r.r[0] = (int)da_max_bytes; + r.r[1] = (int)heap_max_bytes; + PRINTF(("sm setdalimits da: %d heap: %d\n", da_max_bytes, heap_max_bytes)); + + _kernel_swi(SWI_XOS_Bit | SWI_StreamManager_SetDALimits, &r, &r); +} + +/**********************************/ /* module initialization/shutdown */ +/**********************************/ + int soundInit(void) { -// anything to do ? +// make sure all state variables are setup ok + sound_initialised = false; + sound_handle = 0; + sound_stream = 0; + sound_global_buffer_data = NULL; + sound_global_buffer_length = 0; + sound_buffersize = 0; + + sound_delayed_start = false; + sound_delayed_start_time = 0; + PRINTF(("soundInit\n")); + return true; } int soundShutdown(void) { -// anything to do? - return 0; +// close down the streams etc + PRINTF(("soundShutdown\n")); + + if(sound_initialised){ + ssb_closestream(sound_handle); + sound_initialised = false; + } + return true; } /****************/ @@ -34,8 +237,16 @@ int snd_AvailableSpace(void) { -/* Returns the number of bytes of available sound output buffer space. This should be (frames*4) if the device is in stereo mode, or (frames*2) otherwise */ - return 0; +// Returns the number of bytes of available sound output buffer space. +// This should be (frames*4) if the device is in stereo mode, +// or (frames*2) otherwise +// Note that we are not supporting non-stereo anyway + if (!sound_initialised) { + PRINTF(("snd_availableSpace failed - sound not initialised\n")); + return -1; + } + PRINTF(("snd_availableSpace: \n")); // sm_bufferstats prints the number + return (sound_buffersize - sm_bufferstats(sound_stream)); } int snd_InsertSamplesFromLeadTime(int frameCount, int srcBufPtr, int samplesOfLeadTime) { @@ -48,39 +259,115 @@ specifies the number of samples past the estimated sound output buffer position the inserted sound should start. If successful, it returns the number of samples inserted. */ + PRINTF(("snd_InsertSamplesFromLeadTime - not supported\n")); return 0; } int snd_PlaySamplesFromAtLength(int frameCount, int arrayIndex, int startIndex) { -/* Output a buffer's worth of sound samples. */ - return 0; +// Output a frameCount sound samplesfrom the passed in array, starting from startIndex. +// return the number actually 'played'; though no one uses it + if (!sound_initialised) { + interpreterProxy->success(false); + PRINTF(("snd_PlatSamplesFrom failed - sound not initialised\n")); + return false; + } + PRINTF(("snd_PlaySamplesFrom: %d At: %d Length: %d", arrayIndex, startIndex, frameCount)); + sm_addblock(sound_stream, (unsigned char *)(arrayIndex + startIndex), BYTESFROMSAMPLES(frameCount)); + ssb_pause(sound_handle, false); + return frameCount; } int snd_PlaySilence(void) { - - /* Output a buffer's worth of silence. Returns the number of sample frames played. */ - return 0; +// What? Doesn't appear to be used, has no readily apparent purpose + PRINTF(("snd_PlaySilence\n")); + interpreterProxy->success(false); + return 42; } int snd_Start(int frameCount, int samplesPerSec, int stereo, int semaIndex) { +// Start the buffered sound output with the given buffer size, sample rate, stereo flag and semaphore index. + extern char sqTaskName[]; + PRINTF(("snd_Start")); -/* Start the double-buffered sound output with the given buffer size, sample rate, stereo flag and semaphore index. */ - interpreterProxy->primitiveFail(); - return null; +// just for now we won't mess with semaphores + if ( semaIndex ) { + PRINTF((" fails due to semaphore use\n")); + return false; + } + if(!sound_initialised) { + PRINTF((" initialising sound setup\n")); + sm_setdalimits(SOUND_DA_MAX_SIZE, SOUND_HEAP_MAX_SIZE); + if(ssb_openstream(sqTaskName, true,BYTESFROMSAMPLES(frameCount), &sound_handle)) { + if(ssb_returnstreamhandle(sound_handle, &sound_stream)) { + sound_buffersize = SOUND_BUFFER_SIZE(frameCount); + sm_setbuffer(sound_stream, sound_buffersize); + ssb_volume(sound_handle, 0xFFFFFFFF); + ssb_samplerate(sound_handle, samplesPerSec << 10); + // uses 1/1024Hz, so multiply given rate by 1024 + ssb_pause(sound_handle, true); + sound_initialised = true; + } + else { + ssb_closestream(sound_handle); + } + } + if(!sound_initialised){ + sound_handle = 0; + sound_stream = 0; + PRINTF(("snd_Start failed to init\n")); + return false; + } + } + PRINTF(("snd_Start initialised OK\n")); + return true; } int snd_Stop(void) { + PRINTF(("snd_Stop\n")); + // soundShutdown(); + ssb_pause(sound_handle, true); + return null; +} -/* Stop double-buffered sound output. */ + +void snd_Volume(double *left, double *right) { +// used to GET the volume settings +unsigned int leftVol, rightVol; + if (!sound_initialised) { + interpreterProxy->success(false); + PRINTF(("snd_Volume failed - sound not initialised\n")); + return; + } +// get the volume and make doubles out if it + leftVol = sound_volume >> 16; + rightVol = sound_volume & 0xFFFF; + *left = leftVol / 65535.0; + *right = rightVol / 65535.0; + PRINTF(("snd_Volume %f:%f\n", *left, *right)); } +void snd_SetVolume(double left, double right) { +// used to SET the volume settings +unsigned int leftVol, rightVol; + if (!sound_initialised) { + interpreterProxy->success(false); + PRINTF(("snd_SetVolume failed - sound not initialised\n")); + return; + } + + leftVol = (unsigned int)((left > 1.0 ? 1.0 : left) * 0xFFFF) & 0xFFFF; + rightVol = (unsigned int)((right > 1.0 ? 1.0 : right) * 0xFFFF) & 0xFFFF; + PRINTF(("snd_SetVolume %f:%f\n", left, right)); + ssb_volume(sound_handle, (leftVol << 16) | rightVol); +} + /***************/ /* sound input */ /***************/ -int snd_SetRecordLevel(int level) {; +int snd_SetRecordLevel(int level) { return null; } @@ -99,12 +386,3 @@ int snd_RecordSamplesIntoAtLength(int buf, int startSliceIndex, int bufferSizeInBytes) { return null; } - -void snd_Volume(double *left, double *right) { -// used to GET the volume settings -} - -void snd_SetVolume(double left, double right) { -// used to SET the volume settings - interpreterProxy->primitiveFail(); -} Modified: trunk/platforms/RiscOS/vm/config.h =================================================================== --- trunk/platforms/RiscOS/vm/config.h 2013-01-18 19:25:43 UTC (rev 2673) +++ trunk/platforms/RiscOS/vm/config.h 2013-01-24 20:08:41 UTC (rev 2674) @@ -1,13 +1,31 @@ -/**************************************************************************/ -/* A Squeak VM for Acorn RiscOS machines by Tim Rowledge */ -/* tim(a)rowledge.org & http://www.rowledge.org/tim */ -/* Known to work on RiscOS >3.7 for StrongARM RPCs and Iyonix, */ -/* other machines not yet tested. */ -/* config.h -- */ -/* configuration stuff analogous to that produced on *nix machines when */ -/* you run the spawn-of-satan-autoconf stuff. */ -/**************************************************************************/ +// A Squeak VM for RiscOS machines +// Suited to RISC OS > 4, preferably > 5 +// See www.squeak.org for much more information +// +// tim Rowledge tim(a)rowledge.org +// +// License: MIT License - +// Copyright (C) <2013> <tim rowledge> +// @@ Diff output truncated at 50000 characters. @@

1 0

Re: [squeak-dev] AndreasSystemProfiler Released MIT
by Eliot Miranda 24 Jan '13

24 Jan '13

On Wed, Jan 23, 2013 at 12:58 PM, Ron Teitelbaum <ron(a)usmedrec.com> wrote: > Hello All, > > In Memory of Andreas Raab > http://forum.world.st/In-Memory-of-Andreas-Raab-td4663424.html > > We have renamed and released the AndreasSystemProfiler. > Both AndreasSystemProfiler and MessageTally are periodic sampling profilers. The essential difference between AndreasSystemProfiler and MessageTally is in how the current method is sampled. MessageTally is driven from a high-priority process in a loop waiting on a delay. When the delay fires the lower-priority process being profiled is interrupted, its stack is walked to determine the methods along the call chain, and that data is recorded. But since the sampling occurs when the high-priority process preempts the lower-priority process, a sample is only taken at a preemption point. In particular, primitives are *not* profiled because they are not suspension points. A process can only be suspended on method activation (a non-primitive method activation, or primitive failure) or on backward branch. The cost of primitives is charged to a caller and is inferred by subtracting the cost of children of the caller from the caller itself (subtracting the number of samples in children of the caller form the number of samples in the caller itself). Another problem is that using the clock that underlies Delay, which is typically the clock used by processes being profiled, causes sampling errors due to the sampling and sampled processes cohering. Delays are limited in resolution (at best 1 millisecond) so if the profiled process waits on a delay it'll fire immediately after the profiling process (because the profiling process is at higher priority) and so the sampling process may only ever see the sampled process in a wait state. If MessageTally is used to profile multiple processes then a third problem is that if a primitive causes a process switch then its cost will end up being charged to the process switched-to, not switched from. This is again because sampling can only occur after a primitive has completed (successfully or not). AndreasSystemProfiler is driven from a high-priority process in a loop waiting on a Semaphore known to the VM. The profiling process uses a primitive to schedule a sample some number of ticks of the VM's high-performance clock in the future. When the time is reached the VM samples the current method and the current process, *before any process preemption takes place*, and independently of the standard clock, and signals the semaphore. The profiling process then collects the method,process pair via primitives. So AndreasSystemProfiler provides much more accurate results. That said there are still limitations with primitives and Cog. Currently Cog only samples "interpreter" primitives. Those primitives it implements in machine code (integer and float arithmetic, closure evaluation, at:, identityHash) are not sampled and won't show up; they will be charged to the calling method. This is fixable, since Cog actually compiles the sampling direct into interpreter primitive invocation when profiling is in effect and not at other times, but sampling could be a significant cost in these simple and performance-critical primitives. http://ss3.gemstone.com/ss/AndreasSystemProfiler.html > > Using the MIT License. > > Thank you Eliot for your help to get this ready. The profiler works with > Squeak 4.4. > > All the best, > > Ron Teitelbaum, Julie LeMoine and David Smith > > > -----Original Message----- > > From: squeak-dev-bounces(a)lists.squeakfoundation.org [mailto:squeak-dev- > > bounces(a)lists.squeakfoundation.org] On Behalf Of Andreas.Raab > > Sent: Friday, January 11, 2013 1:39 PM > > To: squeak-dev(a)lists.squeakfoundation.org > > Subject: [squeak-dev] Re: Profiling > > > > Levente Uzonyi-2 wrote > > > It uses some primitives which were added to the CogVM, so it requires > Cog. > > > We could reimplement it from scratch using the same primitives and get > > > a better profiler in the image. We can't include this due to the GPL > > > license. > > > > Or ask Ron if 3dicc (which bought all the rights to the Teleplace IP and > > Software) can re-release the code under a more permissable license. > > > > Cheers, > > - Andreas > > > > > > > > > > -- > > View this message in context: http://forum.world.st/Profiling- > > tp4662704p4662987.html > > Sent from the Squeak - Dev mailing list archive at Nabble.com. > > > > > > -- best, Eliot

1 0

configure: line 125: ./build/Makefile*.in: No such file or directory (Windows 7)
by jalo ahonen 23 Jan '13

23 Jan '13

Hi, here's what I did: ... According the *http://www.squeakvm.org/win32/compiling.html*<http://www.squeakvm.org/win32/compiling.html> and the *http://www.squeakvm.org/win32/custom.html*<http://www.squeakvm.org/win32/custom.html>... The build practice is: copy the build(or)win32 directory from inside the platform directory to parallel with platform directory and make the build in your new just copied build directory. 1. Did the additional build directory ... copy into folder = C:\squeak\Squeak4.10.2-2612\mycompile original content from below folder =C:\squeak\Squeak4.10.2-2612\platforms\win32 ... with sources from "Squeak4.10.2-2612.win32-src.zip" *http://www.squeakvm.org/win32/release/Squeak4.10.2-2612.win32-src.zip*<http://www.squeakvm.org/win32/release/Squeak4.10.2-2612.win32-src.zip> 2. Edited the file "Makefile" in directory C:\squeak\Squeak4.10.2-2612\mycompile\build the line 9 to be as: PLATDIR =C:/squeak/Squeak4.10.2-2612/platforms 3. Opened the MSYS prompt MINGW32 and made cd to directory: JaloAhonen@NT ~ $ cd C:/squeak/Squeak4.10.2-2612/mycompile/build 4. All good, so now with growing exitement doing... JaloAhonen@NT /c/squeak/Squeak4.10.2-2612/mycompile/build $ configure The directory './build/src' does not exist. Please reconfigure with the option: SRC=<dir> 5. Oh ? Well no worries then just doing... JaloAhonen@NT /c/squeak/Squeak4.10.2-2612/mycompile/build $ configure SRC=C:/squeak/Squeak4.10.2-2612/mycompile/build/src PLATDIR= /c/squeak/Squeak4.10.2-2612/mycompile/build MINGW= /c/MinGW DX7SDK= /c/dx7sdk SRC= /c/squeak/Squeak4.10.2-2612/mycompile/build/src VM_VERSION= 4.10.2-2612 RC_VERSION= 4,10,2,2612 Configuring: build directory Configuring: Makefile* ./configure: line 125: ./build/Makefile*.in: No such file or directory 6. Ouch... I did not succeed in my goal to: compile a test compile directly from source code and only after that then making a new compile with my own icons and my own splash screen/image... ==> Conclusion: I will appreciate any additional magic from persons in list *vm-dev(a)lists.squeakfoundation.org* ...which would make it possible for me to compile a squeak-build in my enviroment: * Windows 7 Ultimate Processor Intel(R) Core(TM) i7-2630QM CPU @ 2.00GHz Memory (RAM) 16.0 GB Graphics NVIDIA GeForce GTX 560M Gaming graphics 4095 MB Total available graphics memory Primary hard disk 105GB Free (168GB Total) System Manufacturer ASUSTeK Computer Inc. Model 16.0 GB RAM System type 64-bit operating system Number of processor cores 4 Storage Total size of hard disk(s) 866 GB Disk partition (C:) 105 GB Free (168 GB Total) Disk partition (D:) 691 GB Free (699 GB Total) Media drive (E:) CD/DVD Graphics Display adapter type NVIDIA GeForce GTX 560M Total available graphics memory 4095 MB Dedicated graphics memory 3072 MB Dedicated system memory 0 MB Shared system memory 1023 MB Display adapter driver version 8.17.12.6837 Primary monitor resolution 1920x1080 DirectX version DirectX 10 Network Network Adapter Realtek PCIe GBE Family Controller Network Adapter Qualcomm Atheros AR9002WB-1NG Wireless Network Adapter * Regards, Jalo Ahonen

3 4

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 22 Jan '13

22 Jan '13

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 Author: eem Time: 14 December 2012, 4:42:40 am UUID: 0406d3fc-7b8b-4b72-b20a-f254eeb1b893 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 Check for needing sigaltstack properly in setSignalNumber:handler:

4 4

Issue 118 in cog: latest builds from vm breaks access to literals in compiled methods for Pharo 1.4
by cog＠googlecode.com 22 Jan '13

22 Jan '13

Status: Accepted Owner: esteba...(a)gmail.com Labels: Type-Defect Priority-High New issue 118 by esteba...(a)gmail.com: latest builds from vm breaks access to literals in compiled methods for Pharo 1.4 http://code.google.com/p/cog/issues/detail?id=118 take a clean pharo 1.4 image and open with latest builds. Try executing: (Behavior>>name) hash. it raises an error. it happens both, in Eliot builds and mines: 'NBCoInterpreter NativeBoost-CogPlugin-IgorStasenko.15 uuid: 44b6b681-38f1-4a9e-b6ee-8769b499576a Jan 15 2013, NBCogit NativeBoost-CogPlugin-IgorStasenko.15 uuid: 44b6b681-38f1-4a9e-b6ee-8769b499576a Jan 15 2013, git://gitorious.org/~estebanlm/cogvm/cog-osx.git Commit: 270594660b27dd7d18291ea9c73447b1c720059a Date: 2013-01-08 13:11:13 +0100 By: Esteban Lorenzano <estebanlm(a)gmail.com> ' I checked in mac. Curious is that it does not happens in 2.0 It does also happens in Squeak 4.3

1 3

SystemTracing: SystemTracing-dtl.25.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 20 Jan '13

20 Jan '13

Dave Lewis uploaded a new version of SystemTracing to project SystemTracing: http://www.squeaksource.com/SystemTracing/SystemTracing-dtl.25.mcz ==================== Summary ==================== Name: SystemTracing-dtl.25 Author: dtl Time: 4 December 2012, 8:05:17 am UUID: 84fb9f54-d512-4ef1-83d4-e2944b3239be Ancestors: SystemTracing-dtl.24 Add SystemTracer64 class>>traceTo64Script to provide an executable start script that documents the process of tracing a 32-bit image to 64-bit format.

1 0

SystemTracing: SystemTracing-dtl.24.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 20 Jan '13

20 Jan '13

Dave Lewis uploaded a new version of SystemTracing to project SystemTracing: http://www.squeaksource.com/SystemTracing/SystemTracing-dtl.24.mcz ==================== Summary ==================== Name: SystemTracing-dtl.24 Author: dtl Time: 6 November 2012, 7:35:59 am UUID: e01b43c0-7027-4717-bfd5-94c63833e648 Ancestors: SystemTracing-dtl.23 Allow SystemTracer2 (and SystemTracer64) to be run without a progress bar and notifier, to support image tracing from a script with no leftover UI artifacts in the traced image. Fix spelling errors in class comments.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2013